Merge branch 'master' of https://github.com/dhis2/capture-app into hv…

…/fix/DHIS2-18228_ImagesDeletedOnUpdate

CHANGELOG.md

@@ -1,3 +1,46 @@
+## [101.14.1](https://github.com/dhis2/capture-app/compare/v101.14.0...v101.14.1) (2024-10-22)
+
+
+### Bug Fixes
+
+* [DHIS2-16010] app crashes on invalid programid ([#3765](https://github.com/dhis2/capture-app/issues/3765)) ([9133a63](https://github.com/dhis2/capture-app/commit/9133a63e138517c633a192b5d51f39a43c57e327))
+
+# [101.14.0](https://github.com/dhis2/capture-app/compare/v101.13.0...v101.14.0) (2024-10-21)
+
+
+### Features
+
+* [DHIS2-17792] Org unit context in forms ([#3828](https://github.com/dhis2/capture-app/issues/3828)) ([c8ccf63](https://github.com/dhis2/capture-app/commit/c8ccf63e0cde97a190cec6248dc25a4a4d747646))
+
+# [101.13.0](https://github.com/dhis2/capture-app/compare/v101.12.2...v101.13.0) (2024-10-21)
+
+
+### Features
+
+* [DHIS2-16992] Fixed size for changelog modal and columns ([#3834](https://github.com/dhis2/capture-app/issues/3834)) ([3b021cf](https://github.com/dhis2/capture-app/commit/3b021cf5569338db5038d8ed231a810a0fa909f3))
+* [DHIS2-17991] Show orgUnit selector in Enter details now ([#3824](https://github.com/dhis2/capture-app/issues/3824)) ([bf2f1ca](https://github.com/dhis2/capture-app/commit/bf2f1cabebe4ddf100cb8054be0a4af2fbec3965))
+
+## [101.12.2](https://github.com/dhis2/capture-app/compare/v101.12.1...v101.12.2) (2024-10-20)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([9bf7696](https://github.com/dhis2/capture-app/commit/9bf7696de59baf42dd8f8ee1869f4696f83c007a))
+
+## [101.12.1](https://github.com/dhis2/capture-app/compare/v101.12.0...v101.12.1) (2024-10-16)
+
+
+### Bug Fixes
+
+* [DHIS2-17978] use title instead of alt on missing icons ([#3847](https://github.com/dhis2/capture-app/issues/3847)) ([b5940f2](https://github.com/dhis2/capture-app/commit/b5940f21204cf26afce6c28ba88b50c09728265f))
+
+# [101.12.0](https://github.com/dhis2/capture-app/compare/v101.11.2...v101.12.0) (2024-10-15)
+
+
+### Features
+
+* [DHIS2-17956] Display name for org unit in changelog ([#3826](https://github.com/dhis2/capture-app/issues/3826)) ([5299f37](https://github.com/dhis2/capture-app/commit/5299f37d33448616c0074ec6568a82c9c96f65cb))
+
 ## [101.11.2](https://github.com/dhis2/capture-app/compare/v101.11.1...v101.11.2) (2024-10-15)
 
 

cypress/e2e/MainPage/MainPage.js

@@ -1,4 +1,4 @@
-import { Given, Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then } from '@badeball/cypress-cucumber-preprocessor';
 
 Given('you are in the search page with Ngelehun and MNCH PNC context', () => {
     cy.visit('/#/search?orgUnitId=DiszpKrYNg8&programId=uy2gU8kT1jF');
@@ -20,13 +20,13 @@ And('you can load the view with the name Events assigned to me', () => {
 });
 
 Then('the icon is rendered as a custom icon', () => {
-    cy.get('[alt="child_program_positive"]')
+    cy.get('[title="child_program_positive"]')
         .invoke('attr', 'src')
         .should('match', /\/icons\/child_program_positive\/icon$/);
 });
 
 Then('the icon is rendered as an svg', () => {
-    cy.get('[alt="child_program_positive"]')
+    cy.get('[title="child_program_positive"]')
         .invoke('attr', 'src')
         .should('match', /\/icons\/child_program_positive\/icon.svg$/);
 });

cypress/e2e/ScopeSelector/ScopeSelector.feature

@@ -28,8 +28,6 @@ Feature: User uses the ScopeSelector to navigate
     When you select both org unit and program Malaria case registration
     Then you should see the table
 
-  # DHIS2-16010 - App crashes on invalid program id
-  @skip
   Scenario: Main page > Url with invalid program id
     Given you land on a main page with an invalid program id
     Then you should see error message

cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js

@@ -66,7 +66,7 @@ Then('the user sees the enrollment organisation unit', () => {
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-icon-orgunit"]').should('exist');
         cy.get('[data-test="widget-enrollment-orgunit"]')
-            .contains('Started at: Ngelehun CHC')
+            .contains('Started at:Ngelehun CHC')
             .should('exist');
     });
 });
@@ -77,7 +77,7 @@ Then('the user sees the owner organisation unit', () => {
             'exist',
         );
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains('Owned by: Ngelehun CHC')
+            .contains('Owned by:Ngelehun CHC')
             .should('exist');
     });
 });
@@ -232,7 +232,7 @@ 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: Njandama MCHP')
+            .contains('Owned by:Njandama MCHP')
             .should('exist');
     });
 });
@@ -246,7 +246,7 @@ Then(/^the user types in (.*)/, (orgunit) => {
 Given(/^the enrollment owner organisation unit is (.*)/, (orgunit) => {
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains(`Owned by: ${orgunit}`)
+            .contains(`Owned by:${orgunit}`)
             .should('exist');
     });
 });

i18n/cs.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Jiří Podhorecký <jirka.p@volny.cz>, 2024\n"
 "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
@@ -625,53 +625,6 @@ msgstr "Oznámení"
 msgid "Close the notice"
 msgstr "Zavřít oznámení"
 
-msgid "Use new Enrollment dashboard for {{programName}}"
-msgstr "Použít nový ovládací panel zápisu pro {{programName}}"
-
-msgid "Opt in for {{programName}}"
-msgstr "Přihlásit se do {{programName}}"
-
-msgid ""
-"By clicking opt-in below, you will start using the new enrollment dashboard "
-"in the Capture app for this Tracker program. At the moment, there is certain"
-" functionality from Tracker Capture that has not yet been added, including "
-"relationship and referral functionality. The work on including this Tracker "
-"functionality in Capture is ongoing and will be added in upcoming app "
-"releases."
-msgstr ""
-"Kliknutím na přihlášení níže začnete používat nový ovládací panel registrace"
-" v aplikaci Capture pro tento program Tracker. V současné době existuje "
-"určitá funkce z aplikace Tracker Capture, která ještě nebyla přidána, včetně"
-" funkcí vztahů a doporučení. Práce na zahrnutí této funkce sledování do "
-"Capture pokračují a budou přidány v nadcházejících vydáních aplikace."
-
-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 ""
-"Základní tým oceňuje jakoukoli zpětnou vazbu k této nové funkcionalitě, "
-"která je v současné době beta testována, nahlaste prosím jakékoli problémy a"
-" zpětnou vazbu v projektu 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 ""
-"Kliknutím na tlačítko níže se přihlásíte k nové funkci ovládacího panelu "
-"registrace v aplikaci Capture (beta) pro tento program Tracker pro všechny "
-"uživatele."
-
-msgid "Yes, opt in"
-msgstr "Ano, přihlásit se"
-
-msgid "Stop using new Enrollment dashboard for {{programName}}"
-msgstr "Přestat používat nový ovládací panel zápisu pro {{programName}}"
-
-msgid "Opt out for {{programName}}"
-msgstr "Odhlásit se z {{programName}}"
-
 msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr "Zápis s ID \"{{enrollmentId}}\" neexistuje"
 

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-10-24T12:19:48.721Z\n"
-"PO-Revision-Date: 2024-10-24T12:19:48.721Z\n"
+"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
+"PO-Revision-Date: 2024-10-14T14:53:34.553Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -705,9 +705,6 @@ msgstr "View working list in this program."
 msgid "Page is missing required values from URL"
 msgstr "Page is missing required values from URL"
 
-msgid "Program is not valid"
-msgstr "Program is not valid"
-
 msgid "Org unit is not valid with current program"
 msgstr "Org unit is not valid with current program"
 
@@ -1224,6 +1221,12 @@ msgstr "Enrollment widget could not be loaded. Please try again later"
 msgid "Follow-up"
 msgstr "Follow-up"
 
+msgid "Started at{{escape}}"
+msgstr "Started at{{escape}}"
+
+msgid "Owned by{{escape}}"
+msgstr "Owned by{{escape}}"
+
 msgid "Cancelled"
 msgstr "Cancelled"
 
@@ -1414,13 +1417,6 @@ msgstr "{{ linkableStageLabel }} has no linkable events"
 msgid "Ambiguous relationships, contact system administrator"
 msgstr "Ambiguous relationships, contact system administrator"
 
-msgid ""
-"Enter {{linkableStageLabel}} details in the next step after completing this "
-"{{currentStageLabel}}."
-msgstr ""
-"Enter {{linkableStageLabel}} details in the next step after completing this "
-"{{currentStageLabel}}."
-
 msgid "Enter details now"
 msgstr "Enter details now"
 
@@ -1505,6 +1501,9 @@ msgstr "Changelog"
 msgid "No changes to display"
 msgstr "No changes to display"
 
+msgid "Updated"
+msgstr "Updated"
+
 msgid "Created"
 msgstr "Created"
 
@@ -1523,6 +1522,9 @@ msgstr "Data item"
 msgid "Change"
 msgstr "Change"
 
+msgid "Value"
+msgstr "Value"
+
 msgid "New {{trackedEntityTypeName}} relationship"
 msgstr "New {{trackedEntityTypeName}} relationship"
 

i18n/es.po

@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Juan M Alcantara Acosta <jmalcantara1@gmail.com>, 2024\n"
 "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
@@ -646,54 +646,6 @@ msgstr "Aviso"
 msgid "Close the notice"
 msgstr "cerrar el aviso"
 
-msgid "Use new Enrollment dashboard for {{programName}}"
-msgstr "Usar el nuevo panel de inscripción para {{programName}}"
-
-msgid "Opt in for {{programName}}"
-msgstr "Utilizar el nuevo capture para {{programName}}"
-
-msgid ""
-"By clicking opt-in below, you will start using the new enrollment dashboard "
-"in the Capture app for this Tracker program. At the moment, there is certain"
-" functionality from Tracker Capture that has not yet been added, including "
-"relationship and referral functionality. The work on including this Tracker "
-"functionality in Capture is ongoing and will be added in upcoming app "
-"releases."
-msgstr ""
-"Al hacer clic en registrarse a continuación, comenzará a utilizar el nuevo "
-"panel de inscripción en la aplicación Capture para este programa. Por el "
-"momento, hay ciertas funciones de la Tracker Capture que aún no se han "
-"agregado, incluida la función de relación y referencia. El trabajo para "
-"incluir esta funcionalidad Tracker en Capture está en curso y se agregará en"
-" próximos lanzamientos de la aplicación."
-
-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 ""
-"El equipo de desarrollo agradece cualquier comentario sobre esta nueva "
-"funcionalidad que actualmente se está probando en versión beta. Informe "
-"cualquier problema y comentario en el proyecto de JIRA de DHIS2"
-
-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 ""
-"Haga clic en el botón de abajo para optar por la nueva funcionalidad del "
-"panel de inscripción en la aplicación Capture (beta) para este programa "
-"Tracker para todos los usuarios."
-
-msgid "Yes, opt in"
-msgstr "Sí, aceptar"
-
-msgid "Stop using new Enrollment dashboard for {{programName}}"
-msgstr "Deje de usar el nuevo panel de inscripción para {{programName}}"
-
-msgid "Opt out for {{programName}}"
-msgstr "Salir de la prueba del nuevo Capture {{programName}}"
-
 msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr "La inscripción con el ID \"{{enrollmentId}}\" no existe"
 

i18n/fr.po

@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Bram Piot <bram.piot@gmail.com>, 2024\n"
 "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
@@ -644,45 +644,6 @@ msgstr ""
 msgid "Close the notice"
 msgstr ""
 
-msgid "Use new Enrollment dashboard for {{programName}}"
-msgstr ""
-"Utiliser un nouveau tableau de bord d'inscription pour {{programName}}"
-
-msgid "Opt in for {{programName}}"
-msgstr "Choisir {{programName}}"
-
-msgid ""
-"By clicking opt-in below, you will start using the new enrollment dashboard "
-"in the Capture app for this Tracker program. At the moment, there is certain"
-" functionality from Tracker Capture that has not yet been added, including "
-"relationship and referral functionality. The work on including this Tracker "
-"functionality in Capture is ongoing and will be added in upcoming app "
-"releases."
-msgstr ""
-
-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 ""
-
-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 ""
-
-msgid "Yes, opt in"
-msgstr "Oui, choisir"
-
-msgid "Stop using new Enrollment dashboard for {{programName}}"
-msgstr ""
-"Ne plus utiliser le tableau de bord des nouvelles inscriptions pour "
-"{{programName}}"
-
-msgid "Opt out for {{programName}}"
-msgstr "Ne pas chosir {{programName}}"
-
 msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr "L'inscription avec id \"{{enrollmentId}}\" n'existe pas"