-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-16262…
…_CustomEnrollmentOverviewSchema # Conflicts: # i18n/en.pot
- Loading branch information
Showing
97 changed files
with
1,552 additions
and
983 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEventSchedule.feature
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| Feature: The user interacts with the widgets Schedule tab | ||
|
|
||
| # Blocked by DHIS2-16229 | ||
| @skip | ||
| Scenario: User cancel after choose a schedule date in schedule tab | ||
| Given you land on the enrollment add event page by having typed #/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8&teiId=EaOyKGOIGRp&enrollmentId=wBU0RAsYjKE&stageId=A03MvHHogjR&tab=SCHEDULE | ||
| Then you should see Schedule tab | ||
| Then you choose a schedule date | ||
| When you click cancel in Schedule tab | ||
| Then you should see confirm dialog | ||
| Then you should see confirm dialog |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,67 @@ | ||
| // flow-typed signature: c6feccb0af432a25a3ab1270f8309035 | ||
| // flow-typed version: <<STUB>>/@dhis2/ui_v^6.1/flow_v0.132.0 | ||
|
|
||
| /** | ||
| * This is an autogenerated libdef stub for: | ||
| * | ||
| * '@dhis2/ui' | ||
| * | ||
| * Fill this stub out by replacing all the `any` types. | ||
| * | ||
| * Once filled out, we encourage you to share your work with the | ||
| * community by sending a pull request to: | ||
| * https://github.com/flowtype/flow-typed | ||
| */ | ||
|
|
||
| declare module '@dhis2/ui' { | ||
| declare module.exports: any; | ||
| } | ||
|
|
||
| /** | ||
| * We include stubs for each file inside this npm package in case you need to | ||
| * require those files directly. Feel free to delete any files that aren't | ||
| * needed. | ||
| * Flowtype definitions for index | ||
| * Generated by Flowgen from a Typescript Definition | ||
| * Flowgen v1.21.0 | ||
| */ | ||
| declare module '@dhis2/ui/build/cjs/lib' { | ||
| declare module.exports: any; | ||
| } | ||
|
|
||
| declare module '@dhis2/ui/build/es/lib' { | ||
| declare module.exports: any; | ||
| } | ||
|
|
||
| declare module '@dhis2/ui/d2.config' { | ||
| declare module.exports: any; | ||
| } | ||
|
|
||
| declare module '@dhis2/ui/src' { | ||
| declare module.exports: any; | ||
| } | ||
|
|
||
| // Filename aliases | ||
| declare module '@dhis2/ui/build/cjs/lib.js' { | ||
| declare module.exports: $Exports<'@dhis2/ui/build/cjs/lib'>; | ||
| } | ||
| declare module '@dhis2/ui/build/es/lib.js' { | ||
| declare module.exports: $Exports<'@dhis2/ui/build/es/lib'>; | ||
| } | ||
| declare module '@dhis2/ui/d2.config.js' { | ||
| declare module.exports: $Exports<'@dhis2/ui/d2.config'>; | ||
| } | ||
| declare module '@dhis2/ui/src/index' { | ||
| declare module.exports: $Exports<'@dhis2/ui/src'>; | ||
| } | ||
| declare module '@dhis2/ui/src/index.js' { | ||
| declare module.exports: $Exports<'@dhis2/ui/src'>; | ||
| } | ||
| declare export * from "@dhis2/ui-constants"; | ||
| declare export * from "@dhis2/ui-icons"; | ||
| declare export * from "@dhis2/ui-forms"; | ||
| declare export * from "@dhis2-ui/alert"; | ||
| declare export * from "@dhis2-ui/button"; | ||
| declare export * from "@dhis2-ui/box"; | ||
| declare export * from "@dhis2-ui/calendar"; | ||
| declare export * from "@dhis2-ui/card"; | ||
| declare export * from "@dhis2-ui/center"; | ||
| declare export * from "@dhis2-ui/checkbox"; | ||
| declare export * from "@dhis2-ui/chip"; | ||
| declare export * from "@dhis2-ui/cover"; | ||
| declare export * from "@dhis2-ui/css"; | ||
| declare export * from "@dhis2-ui/divider"; | ||
| declare export * from "@dhis2-ui/field"; | ||
| declare export * from "@dhis2-ui/file-input"; | ||
| declare export * from "@dhis2-ui/header-bar"; | ||
| declare export * from "@dhis2-ui/help"; | ||
| declare export * from "@dhis2-ui/input"; | ||
| declare export * from "@dhis2-ui/intersection-detector"; | ||
| declare export * from "@dhis2-ui/label"; | ||
| declare export * from "@dhis2-ui/layer"; | ||
| declare export * from "@dhis2-ui/legend"; | ||
| declare export * from "@dhis2-ui/loader"; | ||
| declare export * from "@dhis2-ui/logo"; | ||
| declare export * from "@dhis2-ui/menu"; | ||
| declare export * from "@dhis2-ui/modal"; | ||
| declare export * from "@dhis2-ui/node"; | ||
| declare export * from "@dhis2-ui/notice-box"; | ||
| declare export * from "@dhis2-ui/organisation-unit-tree"; | ||
| declare export * from "@dhis2-ui/popover"; | ||
| declare export { Popper, PopperProps } from "@dhis2-ui/popper"; | ||
| declare export * from "@dhis2-ui/portal"; | ||
| declare export * from "@dhis2-ui/radio"; | ||
| declare export * from "@dhis2-ui/required"; | ||
| declare export { Pagination, PaginationProps } from "@dhis2-ui/pagination"; | ||
| declare export * from "@dhis2-ui/sharing-dialog"; | ||
| declare export { | ||
| SingleSelect, | ||
| SingleSelectField, | ||
| SingleSelectOption, | ||
| MultiSelect, | ||
| MultiSelectField, | ||
| MultiSelectOption, | ||
| SingleSelectProps, | ||
| SingleSelectFieldProps, | ||
| SingleSelectOptionProps, | ||
| MultiSelectProps, | ||
| MultiSelectFieldProps, | ||
| MultiSelectOptionProps, | ||
| } from "@dhis2-ui/select"; | ||
| declare export * from "@dhis2-ui/selector-bar"; | ||
| declare export * from "@dhis2-ui/switch"; | ||
| declare export * from "@dhis2-ui/table"; | ||
| declare export * from "@dhis2-ui/tab"; | ||
| declare export * from "@dhis2-ui/tag"; | ||
| declare export * from "@dhis2-ui/text-area"; | ||
| declare export * from "@dhis2-ui/tooltip"; | ||
| declare export * from "@dhis2-ui/transfer"; | ||
| declare export * from "@dhis2-ui/user-avatar"; | ||
| declare export * from "@dhis2-ui/segmented-control"; |
Oops, something went wrong.