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

…_RespectBlockEntryFormSetting
dhis2 · Aug 27, 2024 · 678f7a7 · 678f7a7
2 parents 48a08b1 + 3dcc8da
commit 678f7a7
Show file tree

Hide file tree

Showing 28 changed files with 819 additions and 468 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [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)
+
+
+### 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/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
@@ -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
@@ -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
@@ -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
@@ -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/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/...etsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.feature b/...etsForEnrollmentPages/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

diff --git 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 <[email protected]>, 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
@@ -1,14 +1,14 @@
 # 
 # Translators:
 # Philip Larsen Donnelly, 2024
-# Jiří Podhorecký, 2024
+# Jiří Podhorecký <[email protected]>, 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ý <[email protected]>, 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/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-21T19:20:51.149Z\n"
-"PO-Revision-Date: 2024-08-21T19:20:51.149Z\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..."
@@ -1499,6 +1499,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"
 
@@ -1514,9 +1520,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/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 <[email protected]>, 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
@@ -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 <[email protected]>, 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."