Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into DHIS2-18464-align-r…
Browse files Browse the repository at this point in the history
…esult-structure-of-validators
  • Loading branch information
alaa-yahia committed Jan 13, 2025
2 parents 1afcb4c + 33093e0 commit a37897f
Show file tree
Hide file tree
Showing 44 changed files with 547 additions and 199 deletions.
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@
## [101.21.3](https://github.com/dhis2/capture-app/compare/v101.21.2...v101.21.3) (2025-01-12)


### Bug Fixes

* [DHIS2-17613] Use new note endpoint ([#3908](https://github.com/dhis2/capture-app/issues/3908)) ([a9fdea8](https://github.com/dhis2/capture-app/commit/a9fdea8ac8284b28ec3c0acf0551e9cd1a68a180))

## [101.21.2](https://github.com/dhis2/capture-app/compare/v101.21.1...v101.21.2) (2025-01-09)


### Bug Fixes

* [DHIS2-18569] Relationship widget limited to 50 entries ([#3927](https://github.com/dhis2/capture-app/issues/3927)) ([a1e493d](https://github.com/dhis2/capture-app/commit/a1e493d48179e7749d61f52504fdeb3c11dfa53e))

## [101.21.1](https://github.com/dhis2/capture-app/compare/v101.21.0...v101.21.1) (2025-01-08)


### Bug Fixes

* [DHIS2-18632] Sorting stage detail table on orgunit breaks the app ([#3917](https://github.com/dhis2/capture-app/issues/3917)) ([15414cc](https://github.com/dhis2/capture-app/commit/15414cc73f7ce74d4d057acad13bf4855d358426))

# [101.21.0](https://github.com/dhis2/capture-app/compare/v101.20.3...v101.21.0) (2025-01-07)


### Features

* [DHIS2-18328] Handle log entries for occurredAt, scheduledAt and geometry ([#3887](https://github.com/dhis2/capture-app/issues/3887)) ([f670971](https://github.com/dhis2/capture-app/commit/f670971808f49b75295c1d3c7ef25a747b4888df))

## [101.20.3](https://github.com/dhis2/capture-app/compare/v101.20.2...v101.20.3) (2024-12-29)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([f58bcd3](https://github.com/dhis2/capture-app/commit/f58bcd3c62d45101bbb4d5b16f504f1699cbb3d4))

## [101.20.2](https://github.com/dhis2/capture-app/compare/v101.20.1...v101.20.2) (2024-12-22)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([a463047](https://github.com/dhis2/capture-app/commit/a4630471d77804436c8803daed4bd05e5c61f2c7))

## [101.20.1](https://github.com/dhis2/capture-app/compare/v101.20.0...v101.20.1) (2024-12-19)


### Bug Fixes

* [DHIS2-118654] Use importStrategy=DELETE to support older backend ([#3914](https://github.com/dhis2/capture-app/issues/3914)) ([eb5325e](https://github.com/dhis2/capture-app/commit/eb5325e71087c0e00011878bd58f2fef3ad55eea))

# [101.20.0](https://github.com/dhis2/capture-app/compare/v101.19.4...v101.20.0) (2024-12-17)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Feature: User interacts with Stages and Events Widget

@with-restore-deleted-event
Scenario: User can delete an event
Given you open the enrollment page by typing #/enrollment?enrollmentId=ikYMpSKXik1&orgUnitId=DiszpKrYNg8&programId=ur1Edk5Oe2n&teiId=Trc1H9T5C6f
Given you open the enrollment page by typing #/enrollment?enrollmentId=ITyaPVATEwc&orgUnitId=DiszpKrYNg8&programId=ur1Edk5Oe2n&teiId=wsk89u7zquT
And there is an Active event in the TB visit stage
When you click the Delete event overflow button on the Active event
And you confirm you want to delete the event
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getCurrentYear } from '../../../support/date';
import '../sharedSteps';

After({ tags: '@with-restore-deleted-event' }, () => {
cy.visit('#/enrollment?enrollmentId=ikYMpSKXik1&orgUnitId=DiszpKrYNg8&programId=ur1Edk5Oe2n&teiId=Trc1H9T5C6f');
cy.visit('#/enrollment?enrollmentId=ITyaPVATEwc&orgUnitId=DiszpKrYNg8&programId=ur1Edk5Oe2n&teiId=wsk89u7zquT');

cy.get('[data-test="stages-and-events-widget"]')
.find('[data-test="widget-contents"]')
Expand Down Expand Up @@ -215,7 +215,7 @@ When(/you click the (.*) event overflow button on the (.*) event$/, (buttonName,

cy.get('[data-test="overflow-menu"]')
.contains(buttonName)
.click();
.click({ force: true });
});

Then('the event should be skipped', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ After({ tags: '@with-transfer-ownership-data-cleanup' }, () => {
});

const changeEnrollmentAndEventsStatus = () => (
cy.buildApiUrl('tracker', 'trackedEntities/osF4RF4EiqP?program=IpHINAT79UW&fields=enrollments')
cy.buildApiUrl('tracker', 'trackedEntities/mPLqCVS27AD?program=IpHINAT79UW&fields=enrollments')
.then(url => cy.request(url))
.then(({ body }) => {
const enrollment = body.enrollments && body.enrollments.find(e => e.enrollment === 'qyx7tscVpVB');
const enrollment = body.enrollments && body.enrollments.find(e => e.enrollment === 'YqNTNLKmX4z');
const eventsToUpdate = enrollment.events.map(e => ({
...e,
status: 'ACTIVE',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Feature: The user interacts with the widgets on the enrollment add event page
Then you can assign a user when scheduling the event

Scenario: User can complete the enrollment and the active events
Given you land on the enrollment edit event page by having typed #/enrollmentEventNew?enrollmentId=qyx7tscVpVB&orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW&teiId=osF4RF4EiqP
Given you land on the enrollment edit event page by having typed #/enrollmentEventNew?enrollmentId=YqNTNLKmX4z&orgUnitId=RzgSFJ9E46G&programId=IpHINAT79UW&teiId=mPLqCVS27AD
And the enrollment widget should be opened
And the user sees the enrollment status and the Baby Postnatal event status is active
And the user opens the enrollment actions menu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Feature: The user interacts with the widgets on the enrollment dashboard
Then the user can see the program rules effect in the indicator widget

Scenario: User can complete the enrollment and the active events
Given you land on the enrollment dashboard page by having typed #/enrollment?enrollmentId=qyx7tscVpVB
Given you land on the enrollment dashboard page by having typed #/enrollment?enrollmentId=YqNTNLKmX4z
And the enrollment widget should be opened
And the user sees the enrollment status and the Baby Postnatal event status is active
And the user opens the enrollment actions menu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Feature: The user interacts with the widgets on the enrollment edit event
Then the table footer should display page 2

Scenario: User can complete the enrollment and the active events
Given you land on the enrollment edit event page by having typed #/enrollmentEventEdit?eventId=OWpIzQ4xabC&orgUnitId=DiszpKrYNg8
Given you land on the enrollment edit event page by having typed #/enrollmentEventEdit?eventId=PyXThVzWJzL&orgUnitId=RzgSFJ9E46G
And the enrollment widget should be opened
And the user sees the enrollment status and the Baby Postnatal event status is active
And the user opens the enrollment actions menu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
When you select the first 5 rows
Then the filters should be disabled

#DHIS2-18447
@skip
Scenario: The user should see an error message when trying to bulk complete enrollments with errors
Given you open the main page with Ngelehun and Malaria focus investigation context
And you select the first 3 rows
Expand Down
22 changes: 20 additions & 2 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2025-01-07T00:10:53.592Z\n"
"PO-Revision-Date: 2025-01-07T00:10:53.593Z\n"
"POT-Creation-Date: 2024-12-15T15:25:38.375Z\n"
"PO-Revision-Date: 2024-12-15T15:25:38.375Z\n"

msgid "Choose one or more dates..."
msgstr "Choose one or more dates..."
Expand Down Expand Up @@ -101,6 +101,24 @@ msgstr "Date of enrollment"
msgid "Last updated"
msgstr "Last updated"

msgid "Lat"
msgstr "Lat"

msgid "Long"
msgstr "Long"

msgid "lat"
msgstr "lat"

msgid "long"
msgstr "long"

msgid "Show less"
msgstr "Show less"

msgid "Show more"
msgstr "Show more"

msgid "error encountered during field validation"
msgstr "error encountered during field validation"

Expand Down
50 changes: 41 additions & 9 deletions i18n/es_419.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
# Philip Larsen Donnelly, 2024
# Enzo Nicolas Rossi <enzo@dhis2.org>, 2024
# Jaime Bosque <jaime.bosque@dhis2.org>, 2024
# Pablo Del Médico, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-12-03T10:58:18.077Z\n"
"POT-Creation-Date: 2024-12-05T11:39:04.447Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Jaime Bosque <jaime.bosque@dhis2.org>, 2024\n"
"Last-Translator: Pablo Del Médico, 2024\n"
"Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -47,10 +48,10 @@ msgstr ""
"versiones."

msgid "Enrollment dashboard"
msgstr ""
msgstr "Panel de inscripción"

msgid "View event"
msgstr ""
msgstr "Ver evento"

msgid "Edit event"
msgstr "Editar evento"
Expand All @@ -68,7 +69,7 @@ msgid "Cancelled enrollments"
msgstr ""

msgid "{{trackedEntityName}} list"
msgstr ""
msgstr "{{trackedEntityName}} lista"

msgid "Search"
msgstr "Buscar"
Expand All @@ -77,10 +78,10 @@ msgid "Working List"
msgstr ""

msgid "Event list"
msgstr ""
msgstr "Lista de eventos"

msgid "More"
msgstr ""
msgstr "Más"

msgid "View {{programName}} dashboard"
msgstr "Ver panel de {{programName}}"
Expand Down Expand Up @@ -1206,10 +1207,10 @@ msgid "Follow-up"
msgstr ""

msgid "Started at{{escape}}"
msgstr ""
msgstr "Comenzó en {{escape}}"

msgid "Owned by{{escape}}"
msgstr ""
msgstr "Propiedad de {{escape}}"

msgid "Cancelled"
msgstr "Cancelar"
Expand Down Expand Up @@ -1475,9 +1476,40 @@ msgstr ""
msgid "Stages and Events"
msgstr ""

msgid "An error occurred while unlinking and deleting the event."
msgstr ""

msgid "Unlink and delete linked event"
msgstr ""

msgid ""
"Are you sure you want to remove the link and delete the linked event? This "
"action permanently removes the link, linked event, and all related data."
msgstr ""

msgid "Yes, unlink and delete linked event"
msgstr ""

msgid "Unlink event"
msgstr ""

msgid ""
"Are you sure you want to remove the link between these events? This action "
"removes the link itself, but the linked event will remain."
msgstr ""

msgid "Yes, unlink event"
msgstr ""

msgid "View linked event"
msgstr ""

msgid "You do not have access to remove the link between these events"
msgstr ""

msgid "You do not have access to remove the link and delete the linked event"
msgstr ""

msgid "An error occurred while loading the widget."
msgstr ""

Expand Down
43 changes: 37 additions & 6 deletions i18n/nb.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-12-03T10:58:18.077Z\n"
"POT-Creation-Date: 2024-12-05T11:39:04.447Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Karoline Tufte Lien <karoline@dhis2.org>, 2024\n"
"Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n"
Expand Down Expand Up @@ -45,10 +45,10 @@ msgstr ""
"at dette vil lukke andre versjoner."

msgid "Enrollment dashboard"
msgstr ""
msgstr "Registreringsdashbord"

msgid "View event"
msgstr ""
msgstr "Vis hendelse"

msgid "Edit event"
msgstr "Rediger hendelse"
Expand All @@ -66,16 +66,16 @@ msgid "Cancelled enrollments"
msgstr "Avbrutte registreringer"

msgid "{{trackedEntityName}} list"
msgstr ""
msgstr "{{trackedEntityName}}-liste"

msgid "Search"
msgstr "Søk"

msgid "Working List"
msgstr ""
msgstr "Arbeidsliste"

msgid "Event list"
msgstr ""
msgstr "Hendelsesliste"

msgid "More"
msgstr "Mer"
Expand Down Expand Up @@ -1495,9 +1495,40 @@ msgstr "{{ scheduledEvents }} planlagt"
msgid "Stages and Events"
msgstr "Faser og hendelser"

msgid "An error occurred while unlinking and deleting the event."
msgstr ""

msgid "Unlink and delete linked event"
msgstr ""

msgid ""
"Are you sure you want to remove the link and delete the linked event? This "
"action permanently removes the link, linked event, and all related data."
msgstr ""

msgid "Yes, unlink and delete linked event"
msgstr ""

msgid "Unlink event"
msgstr ""

msgid ""
"Are you sure you want to remove the link between these events? This action "
"removes the link itself, but the linked event will remain."
msgstr ""

msgid "Yes, unlink event"
msgstr ""

msgid "View linked event"
msgstr "Vis knyttede hendelser"

msgid "You do not have access to remove the link between these events"
msgstr ""

msgid "You do not have access to remove the link and delete the linked event"
msgstr ""

msgid "An error occurred while loading the widget."
msgstr "En feil oppstå ved lasting av widget. "

Expand Down
Loading

0 comments on commit a37897f

Please sign in to comment.