Merge remote-tracking branch 'refs/remotes/origin/master' into enroll…

…ment-dashboard-design # Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js # src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
dhis2 · Aug 22, 2024 · cf91447 · cf91447
2 parents ecedaff + f5902dd
commit cf91447
Show file tree

Hide file tree

Showing 49 changed files with 1,336 additions and 1,089 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [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)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([4164273](https://github.com/dhis2/capture-app/commit/4164273a380c24f57369f4f7c56dea4f0f6211a1))
+
 ## [101.1.2](https://github.com/dhis2/capture-app/compare/v101.1.1...v101.1.2) (2024-08-15)
 
 

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
@@ -61,3 +66,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/ar.po b/i18n/ar.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-08T11:49:13.423Z\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"
@@ -45,6 +45,9 @@ msgstr ""
 "الصفحة إذا كنت ترغب في استخدام هذه النسخة، ولكن اعلم أن هذا سيؤدي إلى إغلاق "
 "النسخ الأخرى."
 
+msgid "More"
+msgstr "مزيد"
+
 msgid "View {{programName}} dashboard"
 msgstr ""
 
@@ -199,7 +202,7 @@ msgid "Search for user"
 msgstr "البحث عن مستخدم"
 
 msgid "Notes"
-msgstr ""
+msgstr "الملاحظات"
 
 msgid "Basic info"
 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 "توليد حدث جديد"
@@ -575,6 +572,9 @@ msgstr "الأعمدة التي سيتم عرضها في الجدول"
 msgid "Column"
 msgstr "العمود"
 
+msgid "Visible"
+msgstr "مرئي"
+
 msgid "Update"
 msgstr "تحديث"
 
@@ -782,12 +782,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 ""
 
@@ -818,6 +812,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 ""
 
@@ -931,6 +930,18 @@ msgid ""
 "relationship"
 msgstr "ستؤدي مغادرة هذه الصفحة إلى تجاهل التحديدات التي أجريتها لعلاقة جديدة"
 
+msgid "Errors"
+msgstr "اخطاء"
+
+msgid "Feedback"
+msgstr "التغذية الراجعة"
+
+msgid "Indicators"
+msgstr "المؤشرات"
+
+msgid "Warnings"
+msgstr "تحذيرات"
+
 msgid "Show all events"
 msgstr "عرض جميع الأحداث"
 
@@ -976,6 +987,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 "إحتمال وجود تكرار"
 
@@ -1257,9 +1274,6 @@ msgstr ""
 msgid "Owned by {{ownerOrgUnit}}"
 msgstr ""
 
-msgid "Last updated {{date}}"
-msgstr ""
-
 msgid "Cancelled"
 msgstr "الملغية"
 
@@ -1512,6 +1526,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 ""
 
@@ -1677,9 +1700,6 @@ msgstr "حدث خطأ. انظر السجل للحصول على التفاصيل"
 msgid "Scheduled{{ escape }} due {{ time }}"
 msgstr ""
 
-msgid "Scheduled"
-msgstr "تمت جدولته"
-
 msgid "Overdue{{ escape }} due {{ time }}"
 msgstr ""
 

diff --git 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-06-28T11:23:02.970Z\n"
+"POT-Creation-Date: 2024-08-08T11:49:13.423Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: KRG HIS <[email protected]>, 2024\n"
 "Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n"
@@ -42,6 +42,9 @@ msgstr ""
 "الصفحة إذا كنت ترغب في استخدام هذه النسخة، ولكن اعلم أن هذا سيؤدي إلى إغلاق "
 "النسخ الأخرى."
 
+msgid "More"
+msgstr ""
+
 msgid "View {{programName}} dashboard"
 msgstr ""
 
@@ -372,17 +375,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 ""
@@ -572,6 +569,9 @@ msgstr "الأعمدة التي سيتم عرضها في الجدول"
 msgid "Column"
 msgstr "العمود"
 
+msgid "Visible"
+msgstr ""
+
 msgid "Update"
 msgstr "تحديث"
 
@@ -779,12 +779,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 ""
 
@@ -815,6 +809,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 ""
 
@@ -928,6 +927,18 @@ msgid ""
 "relationship"
 msgstr "ستؤدي مغادرة هذه الصفحة إلى تجاهل التحديدات التي أجريتها لعلاقة جديدة"
 
+msgid "Errors"
+msgstr "اخطاء"
+
+msgid "Feedback"
+msgstr "التغذية الراجعة"
+
+msgid "Indicators"
+msgstr "المؤشرات"
+
+msgid "Warnings"
+msgstr "تحذيرات"
+
 msgid "Show all events"
 msgstr "عرض جميع الأحداث"
 
@@ -973,6 +984,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 "إحتمال وجود تكرار"
 
@@ -1252,9 +1269,6 @@ msgstr ""
 msgid "Owned by {{ownerOrgUnit}}"
 msgstr ""
 
-msgid "Last updated {{date}}"
-msgstr ""
-
 msgid "Cancelled"
 msgstr "تم الإلغاء"
 
@@ -1507,6 +1521,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 ""
 
@@ -1672,9 +1695,6 @@ msgstr "حدث خطأ. انظر السجل للحصول على التفاصيل"
 msgid "Scheduled{{ escape }} due {{ time }}"
 msgstr ""
 
-msgid "Scheduled"
-msgstr "تمت جدولته"
-
 msgid "Overdue{{ escape }} due {{ time }}"
 msgstr ""