Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-16337…

…_OrgUnitInViewEventPage

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [101.16.2](https://github.com/dhis2/capture-app/compare/v101.16.1...v101.16.2) (2024-11-19)
+
+
+### Bug Fixes
+
+* [DHIS2-16994] Image and File DE and TEA not Displayed in Changelog ([#3837](https://github.com/dhis2/capture-app/issues/3837)) ([9327210](https://github.com/dhis2/capture-app/commit/932721045126e02379f56a85af4f6586b836b4c0))
+
+## [101.16.1](https://github.com/dhis2/capture-app/compare/v101.16.0...v101.16.1) (2024-11-17)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([37c32df](https://github.com/dhis2/capture-app/commit/37c32df3e7839e30b493ff8e8185de769c3e2fd4))
+
 # [101.16.0](https://github.com/dhis2/capture-app/compare/v101.15.0...v101.16.0) (2024-11-13)
 
 

cypress/e2e/NewPage/NewPage.js

@@ -469,14 +469,14 @@ And('you fill the WHO RMNCH program registration form with its required unique v
 });
 
 And('you fill the WHO RMNCH program registration form with its required values', () => {
-    cy.get('[data-test="capture-ui-input"]')
-        .eq(2)
-        .type('Ava');
-
     cy.get('[data-test="capture-ui-input"]')
         .eq(3)
         .type('Didriksson');
 
+    cy.get('[data-test="capture-ui-input"]')
+        .eq(2)
+        .type('Ava');
+
     cy.get('[data-test="capture-ui-input"]')
         .eq(9)
         .type('1985-10-01')

cypress/e2e/WorkingLists/TeiWorkingLists/TeiBulkActions/TeiBulkActions.feature

@@ -51,6 +51,8 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
     When you confirm 3 active enrollments successfully
     Then the bulk complete enrollments modal should close
 
+#DHIS2-18447
+@skip
   Scenario: the user should be able to bulk complete enrollments without completing events
     Given you open the main page with Ngelehun and Malaria Case diagnosis context
     And you select row number 1
@@ -61,6 +63,8 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
     When you confirm 1 active enrollment without completing events successfully
     Then the bulk complete enrollments modal should close
 
+#DHIS2-18447
+@skip
   Scenario: the user should be able to bulk delete enrollments
     Given you open the main page with Ngelehun and Malaria Case diagnosis context
     And you select the first 3 rows
@@ -69,6 +73,8 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
     When you confirm deleting 3 enrollments
     Then the bulk delete enrollments modal should close
 
+#DHIS2-18447
+@skip
   Scenario: the user should be able to bulk delete only active enrollments
     Given you open the main page with Ngelehun and Malaria Case diagnosis context
     And you select the first 3 rows

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-11-21T13:04:21.389Z\n"
-"PO-Revision-Date: 2024-11-21T13:04:21.389Z\n"
+"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n"
+"PO-Revision-Date: 2024-11-07T11:57:59.094Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1550,6 +1550,12 @@ msgstr "Change"
 msgid "Value"
 msgstr "Value"
 
+msgid "File"
+msgstr "File"
+
+msgid "Image"
+msgstr "Image"
+
 msgid "New {{trackedEntityTypeName}} relationship"
 msgstr "New {{trackedEntityTypeName}} relationship"
 

i18n/es_419.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
+"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Jaime Bosque <[email protected]>, 2024\n"
 "Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n"
@@ -700,8 +700,10 @@ msgid "Add new enrollment for {{teiDisplayName}} in this program."
 msgstr ""
 "Agregue una nueva inscripción para {{teiDisplayName}} en este programa."
 
-msgid "No access to program owner."
-msgstr "Sin acceso al propietario del programa."
+msgid ""
+"You do not have permissions to access to this program, registering unit or "
+"record, contact your administrator for more information."
+msgstr ""
 
 msgid "{{teiDisplayName}} is not enrolled in this program."
 msgstr "{{teiDisplayName}} no está inscrito en este programa."
@@ -1098,7 +1100,7 @@ msgstr ""
 msgid "Assigned to"
 msgstr ""
 
-msgid "You don't have access to edit this assignee"
+msgid "You don't have access to edit the assigned user"
 msgstr ""
 
 msgid "Edit"
@@ -1107,7 +1109,7 @@ msgstr ""
 msgid "No one is assigned to this event"
 msgstr "No hay nadie asignado a este evento."
 
-msgid "You don't have access to assign an assignee"
+msgid "You don't have access to assign a user to this event"
 msgstr ""
 
 msgid "Assign"
@@ -1153,6 +1155,9 @@ msgstr ""
 msgid "Mark incomplete"
 msgstr ""
 
+msgid "You do not have access to delete this enrollment"
+msgstr ""
+
 msgid "Delete enrollment"
 msgstr ""
 
@@ -1534,7 +1539,7 @@ msgid "Change"
 msgstr ""
 
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 msgid "New {{trackedEntityTypeName}} relationship"
 msgstr ""

i18n/pt.po

@@ -11,13 +11,14 @@
 # Jason Pickering <[email protected]>, 2024
 # Helton Dias, 2024
 # Shelsea Chumaio, 2024
+# Laurência Luís, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
 "POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Shelsea Chumaio, 2024\n"
+"Last-Translator: Laurência Luís, 2024\n"
 "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -340,7 +341,7 @@ msgstr ""
 
 msgid ""
 "Would you like to complete the enrollment and all active events as well?"
-msgstr ""
+msgstr "Gostaria de completar a inscrição e todos os eventos activos?"
 
 msgid "{{count}} event in {{programStageName}}"
 msgid_plural "{{count}} event in {{programStageName}}"
@@ -349,13 +350,13 @@ msgstr[1] ""
 msgstr[2] ""
 
 msgid "Yes, complete enrollment and events"
-msgstr ""
+msgstr "Sim, completar a inscrição e os eventos"
 
 msgid "Complete enrollment only"
-msgstr ""
+msgstr "Completar apenas a inscrição"
 
 msgid "Would you like to complete the enrollment?"
-msgstr ""
+msgstr "Gostaria de completar a inscrição?"
 
 msgid "Complete enrollment"
 msgstr "Completar inscrição"
@@ -391,7 +392,7 @@ msgid "validation failed"
 msgstr "falha na validação"
 
 msgid "No feedback for this event yet"
-msgstr ""
+msgstr "Ainda não há feedback para este evento"
 
 msgid "No indicator output for this event yet"
 msgstr ""
@@ -701,8 +702,10 @@ msgstr "Não há inscrições ativas."
 msgid "Add new enrollment for {{teiDisplayName}} in this program."
 msgstr "Adicione uma nova inscrição para {{teiDisplayName}} neste programa."
 
-msgid "No access to program owner."
-msgstr "Sem acesso ao proprietário do programa."
+msgid ""
+"You do not have permissions to access to this program, registering unit or "
+"record, contact your administrator for more information."
+msgstr ""
 
 msgid "{{teiDisplayName}} is not enrolled in this program."
 msgstr "{{teiDisplayName}} não está inscrito neste programa."
@@ -1107,7 +1110,7 @@ msgstr ""
 msgid "Assigned to"
 msgstr "Atribuído a"
 
-msgid "You don't have access to edit this assignee"
+msgid "You don't have access to edit the assigned user"
 msgstr ""
 
 msgid "Edit"
@@ -1116,7 +1119,7 @@ msgstr "Editar"
 msgid "No one is assigned to this event"
 msgstr "Ninguém está atribuído a este evento"
 
-msgid "You don't have access to assign an assignee"
+msgid "You don't have access to assign a user to this event"
 msgstr ""
 
 msgid "Assign"

i18n/ru.po

@@ -701,8 +701,10 @@ msgstr ""
 "Создать новую регистрационную запись для объекта {{teiDisplayName}} в данной"
 " программе."
 
-msgid "No access to program owner."
-msgstr "Нет доступа к владельцу программы."
+msgid ""
+"You do not have permissions to access to this program, registering unit or "
+"record, contact your administrator for more information."
+msgstr ""
 
 msgid "{{teiDisplayName}} is not enrolled in this program."
 msgstr "Объект {{teiDisplayName}} не зарегистрирован в данной программе."
@@ -1106,17 +1108,17 @@ msgstr "Нет доступных отслеживаемых типов объе
 msgid "Assigned to"
 msgstr "Назначено пользователю"
 
-msgid "You don't have access to edit this assignee"
-msgstr "У вас нет доступа к редактированию данного назначенного пользователя"
+msgid "You don't have access to edit the assigned user"
+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 "You don't have access to assign a user to this event"
+msgstr ""
 
 msgid "Assign"
 msgstr "Назначить"

i18n/zh_CN.po

@@ -667,8 +667,10 @@ msgstr "没有活跃的注册。"
 msgid "Add new enrollment for {{teiDisplayName}} in this program."
 msgstr "在此计划中为 {{teiDisplayName}} 添加新注册。"
 
-msgid "No access to program owner."
-msgstr "无法访问程序所有者。"
+msgid ""
+"You do not have permissions to access to this program, registering unit or "
+"record, contact your administrator for more information."
+msgstr ""
 
 msgid "{{teiDisplayName}} is not enrolled in this program."
 msgstr "该项目未报名{{teiDisplayName}} 。"
@@ -1055,7 +1057,7 @@ msgstr ""
 msgid "Assigned to"
 msgstr "指派到"
 
-msgid "You don't have access to edit this assignee"
+msgid "You don't have access to edit the assigned user"
 msgstr ""
 
 msgid "Edit"
@@ -1064,7 +1066,7 @@ msgstr "编辑"
 msgid "No one is assigned to this event"
 msgstr "没有人被分配到的该事件"
 
-msgid "You don't have access to assign an assignee"
+msgid "You don't have access to assign a user to this event"
 msgstr ""
 
 msgid "Assign"

package.json

@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "101.16.0",
+    "version": "101.16.2",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "101.16.0",
+        "@dhis2/rules-engine-javascript": "101.16.2",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",

packages/rules-engine/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "101.16.0",
+    "version": "101.16.2",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js

@@ -56,6 +56,7 @@ const getStyles = () => ({
 type Props = {
     showEditEvent: ?boolean,
     eventId: string,
+    eventData: Object,
     onOpenEditEvent: (orgUnit: Object, programCategory: ?ProgramCategory) => void,
     programStage: ProgramStage,
     eventAccess: { read: boolean, write: boolean },
@@ -76,6 +77,7 @@ const EventDetailsSectionPlain = (props: Props) => {
     const {
         classes,
         eventId,
+        eventData,
         onOpenEditEvent,
         showEditEvent,
         programStage,
@@ -200,6 +202,7 @@ const EventDetailsSectionPlain = (props: Props) => {
                 <EventChangelogWrapper
                     isOpen
                     setIsOpen={setChangeLogIsOpen}
+                    eventData={eventData}
                     eventId={eventId}
                     formFoundation={programStage.stageForm}
                 />

src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.container.js

@@ -10,6 +10,7 @@ import type { ProgramCategory } from '../../../WidgetEventSchedule/CategoryOptio
 const mapStateToProps = (state: ReduxState) => ({
     showEditEvent: state.viewEventPage.eventDetailsSection && state.viewEventPage.eventDetailsSection.showEditEvent,
     eventId: state.viewEventPage.eventId,
+    eventData: state.viewEventPage.loadedValues?.eventContainer?.values || {},
     programId: state.currentSelections.programId,
 });
 

src/core_modules/capture-core/components/WidgetEventEdit/EventChangelogWrapper/EventChangelogWrapper.component.js

@@ -5,7 +5,7 @@ import { dataElementTypes } from '../../../metaData';
 import type { Props } from './EventChangelogWrapper.types';
 import { WidgetEventChangelog } from '../../WidgetsChangelog';
 
-export const EventChangelogWrapper = ({ formFoundation, eventId, ...passOnProps }: Props) => {
+export const EventChangelogWrapper = ({ formFoundation, eventId, eventData, ...passOnProps }: Props) => {
     const dataItemDefinitions = useMemo(() => {
         const elements = formFoundation.getElements();
         const contextLabels = formFoundation.getLabels();
@@ -52,6 +52,7 @@ export const EventChangelogWrapper = ({ formFoundation, eventId, ...passOnProps
         <WidgetEventChangelog
             {...passOnProps}
             eventId={eventId}
+            eventData={eventData}
             dataItemDefinitions={dataItemDefinitions}
         />
     );

src/core_modules/capture-core/components/WidgetEventEdit/EventChangelogWrapper/EventChangelogWrapper.types.js

@@ -10,4 +10,5 @@ type PassOnProps = {|
 export type Props = {
     ...PassOnProps,
     formFoundation: RenderFoundation,
+    eventData: Object,
 };

src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js

@@ -236,6 +236,7 @@ export const WidgetEventEditPlain = ({
                     isOpen
                     setIsOpen={setChangeLogIsOpen}
                     eventId={loadedValues.eventContainer.id}
+                    eventData={loadedValues.eventContainer.values}
                     formFoundation={formFoundation}
                 />
             )}

src/core_modules/capture-core/components/WidgetProfile/OverflowMenu/OverflowMenu.component.js

@@ -9,6 +9,7 @@ import { TrackedEntityChangelogWrapper } from './TrackedEntityChangelogWrapper';
 
 export const OverflowMenuComponent = ({
     trackedEntity,
+    trackedEntityData,
     trackedEntityTypeName,
     canWriteData,
     canCascadeDeleteTei,
@@ -68,6 +69,7 @@ export const OverflowMenuComponent = ({
                     programAPI={programAPI}
                     isOpen={changelogIsOpen}
                     setIsOpen={setChangelogIsOpen}
+                    trackedEntityData={trackedEntityData}
                 />
             )}
         </>