Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
Browse files Browse the repository at this point in the history
…/feat/DHIS2-17991_ShowOrgUnitSelectorInEnterDetailsNow
  • Loading branch information
henrikmv committed Oct 14, 2024
2 parents a520044 + 5444ac7 commit 9eb051f
Show file tree
Hide file tree
Showing 42 changed files with 437 additions and 902 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [101.11.0](https://github.com/dhis2/capture-app/compare/v101.10.2...v101.11.0) (2024-10-14)


### Features

* [DHIS2-17970] Auto-select orgUnit if there is only one available ([#3798](https://github.com/dhis2/capture-app/issues/3798)) ([de06f8b](https://github.com/dhis2/capture-app/commit/de06f8b1b5480ba7315ca648784ef414f8473e06))

## [101.10.2](https://github.com/dhis2/capture-app/compare/v101.10.1...v101.10.2) (2024-10-14)


### Bug Fixes

* [DHIS2-18215] selected working list not persisted on navigate ([#3838](https://github.com/dhis2/capture-app/issues/3838)) ([599b2c1](https://github.com/dhis2/capture-app/commit/599b2c1e29c94fd0258844aadb7eef20e03024eb))

## [101.10.1](https://github.com/dhis2/capture-app/compare/v101.10.0...v101.10.1) (2024-10-14)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ Feature: User interacts with the Enrollment New Event Workspace

Scenario: User should be asked to create new event after completing a stage and choose to cancel
Given you land on the enrollment new event page by having typed #/enrollmentEventNew?enrollmentId=zRfAPUpjoG3&orgUnitId=DiszpKrYNg8&programId=M3xtLkYBlKI&stageId=CWaAcQYKVpq&teiId=S3JjTA4QMNe
And the data store is clean
Then you see the following Enrollment: New Event
And you see the widget header Foci investigation & classification
And you type 2022-01-01 in the input number 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Feature: Breaking the glass page
@skip
Scenario: User with search scope access tries to access an enrollment in a protected program
Given the tei created by this test is cleared from the database
And the data store is clean
And you create a new tei in Child programme from Ngelehun CHC
And you change program to WHO RMNCH Tracker
And you enroll the tei from Njandama MCHP
Expand Down
9 changes: 0 additions & 9 deletions cypress/e2e/MainPage/MainPage.feature
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@ Feature: User interacts with Main page
Then the current url is /#/?orgUnitId=DiszpKrYNg8&programId=uy2gU8kT1jF&selectedTemplateId=uy2gU8kT1jF-default
And the TEI working list is displayed

Scenario: The admin user can optout from using the new Enrollment Dashboard
Given you open the main page with Ngelehun and child programme context
And the data store is clean
And you see the opt out component for Child Programme
When you opt out to use the new enrollment Dashboard for Child Programme
Then you see the opt in component for Child Programme
When you opt in to use the new enrollment Dashboard for Child Programme
Then you see the opt out component for Child Programme

@v<41
Scenario: The icon is rendered as an svg
Given you are in the main page with no selections made
Expand Down
6 changes: 0 additions & 6 deletions cypress/e2e/NewPage/NewPage.feature
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Feature: User creates a new entries from the registration page
@v>=41
Scenario: New person in Tracker Program > Filling the Allergies with multiple options
Given you are in the WHO RMNCH program registration page
And the data store is clean
When you fill in multiple Allergies options
Then you can see the multiple selections in the form
And you fill the WHO RMNCH program registration form with its required unique values
Expand Down Expand Up @@ -103,14 +102,12 @@ Feature: User creates a new entries from the registration page

Scenario: New person > Submitting the form with unique name navigates you to the user dashboard
Given you are in the Person registration page
And the data store is clean
When you fill in a unique first name
And you click the save person submit button
Then you are navigated to the enrollment dashboard page without enrollment

Scenario: New person > Submitting the form from the duplicates modal navigates you to the user dashboard
Given you are in the Person registration page
And the data store is clean
When you fill in the first name with value that has duplicates
And you click the save person submit button
And you see the possible duplicates modal
Expand Down Expand Up @@ -152,7 +149,6 @@ Feature: User creates a new entries from the registration page

Scenario: New person in Tracker Program > Submitting the form with unique values navigates you to the user dashboard
Given you are in the WHO RMNCH program registration page
And the data store is clean
When you fill the WHO RMNCH program registration form with its required unique values
And you click the save person submit button
Then you see the enrollment event Edit page
Expand All @@ -166,7 +162,6 @@ Feature: User creates a new entries from the registration page

Scenario: New person in Tracker Program > Submitting the form from the duplicates modal navigates you to the user dashboard
Given you are in the WHO RMNCH program registration page
And the data store is clean
When you fill the WHO RMNCH program registration form with its required values
And you click the save person submit button
And you see the possible duplicates modal
Expand All @@ -192,7 +187,6 @@ Feature: User creates a new entries from the registration page

Scenario: Go to enrollment event when Open data entry form after enrollment is checked
Given you are in the Malaria case diagnosis, treatment and investigation program registration page
And the data store is clean
And you fill the Malaria case diagnosis registration form with values
And you click the save malaria entity submit button
Then you see the enrollment event Edit page
Expand Down
4 changes: 0 additions & 4 deletions cypress/e2e/SearchPage/SearchPage.feature
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Feature: User interacts with Search page

Scenario: Searching using unique identifier returns results
Given you are on the default search page
And the data store is clean
When you select the search domain WHO RMNCH Tracker
And you fill in the unique identifier field with values that will return a tracked entity instance
And you click find
Expand Down Expand Up @@ -97,7 +96,6 @@ Feature: User interacts with Search page

Scenario: Searching using attributes in Tracker Program navigates user to the dashboard view
Given you are on the default search page
And the data store is clean
When you select the search domain WHO RMNCH Tracker
And you expand the attributes search area
And you fill in the last name with values that will return results
Expand All @@ -108,7 +106,6 @@ Feature: User interacts with Search page

Scenario: Searching using attributes in TEType navigates user to dashboard view
Given you are on the default search page
And the data store is clean
When you select the search domain Person
And you expand the attributes search area
And you fill in the the form with first name value: Cla
Expand Down Expand Up @@ -165,7 +162,6 @@ Feature: User interacts with Search page

Scenario: Pressing enter should trigger search unique identifier returns results
Given you are on the default search page
And the data store is clean
When you select the search domain WHO RMNCH Tracker
And you press enter after filling in the unique identifier field with values that will return a tracked entity instance
Then you are navigated to the enrollment dashboard page
Expand Down
Loading

0 comments on commit 9eb051f

Please sign in to comment.