diff --git a/.github/workflows/dhis2-verify-commits.yml b/.github/workflows/dhis2-verify-commits.yml index ae7831b56a..51c4fb414c 100644 --- a/.github/workflows/dhis2-verify-commits.yml +++ b/.github/workflows/dhis2-verify-commits.yml @@ -6,6 +6,7 @@ on: jobs: lint-pr-title: + if: github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'dhis2-bot' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -18,6 +19,7 @@ jobs: configuration-path: ${{ steps.commitlint.outputs.config_path }} lint-commits: + if: github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'dhis2-bot' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 37492757dc..4c7e1ebd54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +## [101.19.1](https://github.com/dhis2/capture-app/compare/v101.19.0...v101.19.1) (2024-12-05) + + +### Bug Fixes + +* [DHIS2-17854] validate the assigned values from rules engine ([#3783](https://github.com/dhis2/capture-app/issues/3783)) ([db9d6b8](https://github.com/dhis2/capture-app/commit/db9d6b8f23fb29af30ef61fb3649c167073a46ff)) + +# [101.19.0](https://github.com/dhis2/capture-app/compare/v101.18.1...v101.19.0) (2024-12-03) + + +### Features + +* [DHIS2-15462] Use dhis2 UI calendarinput component in forms ([#3658](https://github.com/dhis2/capture-app/issues/3658)) ([f39fd47](https://github.com/dhis2/capture-app/commit/f39fd471cb2f176a417667481b17a72b2d4651dd)) + +## [101.18.1](https://github.com/dhis2/capture-app/compare/v101.18.0...v101.18.1) (2024-12-03) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([a2d43b2](https://github.com/dhis2/capture-app/commit/a2d43b2db7b926066a438d6f5f42ad19d37987fe)) + # [101.18.0](https://github.com/dhis2/capture-app/compare/v101.17.0...v101.18.0) (2024-11-28) diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js index ca8d21ed03..7a8523cfa6 100644 --- a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js +++ b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js @@ -89,7 +89,7 @@ When(/^you click the create new button number (.*)$/, (eq) => { }); When(/^you type (.*) in the input number (.*)$/, (value, eq) => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(eq) .type(value) .blur(); @@ -155,7 +155,7 @@ When(/^the user selects (.*)$/, (value) => { }); When(/^you focus and blur a required field/, () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .focus() .blur(); diff --git a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js index 93ab1beea1..3f42786176 100644 --- a/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js +++ b/cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js @@ -84,7 +84,7 @@ When(/^the user clicks on the cancel button/, () => When(/^the user set the apgar score to (.*)/, score => cy .get('[data-test="widget-enrollment-event"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(2) .clear() .type(score) @@ -118,8 +118,8 @@ When('the user clicks switch tab to Schedule', () => { Then('the user selects another schedule date', () => { cy.get('[data-test="schedule-section"]').within(() => { - cy.get("[data-test='capture-ui-input']").eq(0).should('have.value', `${getCurrentYear() - 15}-01-07`); - cy.get("[data-test='capture-ui-input']").eq(0) + cy.get('input[type="text"]').eq(0).should('have.value', `${getCurrentYear() - 15}-01-07`); + cy.get('input[type="text"]').eq(0) .clear() .type(`${getCurrentYear()}-08-01`) .blur(); diff --git a/cypress/e2e/EnrollmentPage/BreakingTheGlass/BreakingTheGlass.js b/cypress/e2e/EnrollmentPage/BreakingTheGlass/BreakingTheGlass.js index 7e33f96bc7..a9ca4a6e31 100644 --- a/cypress/e2e/EnrollmentPage/BreakingTheGlass/BreakingTheGlass.js +++ b/cypress/e2e/EnrollmentPage/BreakingTheGlass/BreakingTheGlass.js @@ -16,21 +16,21 @@ Given('the tei created by this test is cleared from the database', () => { And('you create a new tei in Child programme from Ngelehun CHC', () => { cy.visit('/#/new?orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW'); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .type('1999-09-01') .blur(); cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Breaking') .blur(); cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('TheGlass') .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(7) .type('2023-09-01') .blur(); @@ -68,7 +68,7 @@ And('you enroll the tei from Njandama MCHP', () => { .click(); cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(8) .type('1999-09-01') .blur(); diff --git a/cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js b/cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js index 43152029ff..151c272842 100644 --- a/cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js +++ b/cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js @@ -28,7 +28,7 @@ Given('you add an enrollment event that will result in a rule effect to hide a p '/#/enrollmentEventNew?enrollmentId=fmhIsWXVDmS&orgUnitId=s7SLtx8wmRA&programId=WSGAb5XwJ3Y&stageId=PFDfvmGpsR3&teiId=uW8Y7AIcRKA', ); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(0) .type(moment().format('YYYY-MM-DD')) .blur(); diff --git a/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.js b/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.js index d4771a8876..35d8996ee7 100644 --- a/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.js +++ b/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.js @@ -11,7 +11,7 @@ After({ tags: '@with-restore-deleted-event' }, () => { .find('[data-test="create-new-button"]') .click(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .first() .type('2023-01-26') .blur(); diff --git a/cypress/e2e/NewPage/NewPage.js b/cypress/e2e/NewPage/NewPage.js index a4a7579656..caecc7dd8b 100644 --- a/cypress/e2e/NewPage/NewPage.js +++ b/cypress/e2e/NewPage/NewPage.js @@ -328,7 +328,7 @@ Then('you see validation error on visit date', () => { }); And('you fill in 200 in the hemoglobin', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .type('200'); }); @@ -340,13 +340,13 @@ And('you see validation error on hemoglobin', () => { }); And('you fill in the visit date', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(0) - .type(`${getCurrentYear()}-01-01`); + .type(`${getCurrentYear()}-01-01`).blur(); }); And('you fill in the hemoglobin', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .type('50'); }); @@ -389,14 +389,14 @@ And('you are in the Person registration page', () => { }); And('you fill in the first name with value that has duplicates', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .type('Sarah') .blur(); }); And('you fill in a unique first name', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .type(`Sarah-${Math.round((new Date()).getTime() / 1000)}`) .blur(); @@ -427,7 +427,7 @@ Then('you submit the form again from the duplicates modal', () => { // New person in WHO RMNCH Tracker And('you are in the WHO RMNCH program registration page', () => { cy.visit('/#/new?programId=WSGAb5XwJ3Y&orgUnitId=DiszpKrYNg8'); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .invoke('val').should('not.be.empty'); }); @@ -441,7 +441,7 @@ And('you are in Child programme and Buma MCHP organization unit registration pag }); And('you fill the form with age 0', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(9) .type(moment().format('YYYY-MM-DD')) .blur(); @@ -454,37 +454,37 @@ And('you see validation warning on birth date', () => { }); And('you fill the WHO RMNCH program registration form with its required unique values', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(2) .type(`Sarah-${Math.round((new Date()).getTime() / 1000)}`); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(3) .type('Gonzales'); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(9) .type('1992-01-01') .blur(); }); And('you fill the WHO RMNCH program registration form with its required values', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(3) .type('Didriksson'); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(2) .type('Ava'); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(9) .type('1985-10-01') .blur(); }); And('you fill in child programme first name with value that has duplicates', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(4) .type('Sarah') .blur(); @@ -492,18 +492,18 @@ And('you fill in child programme first name with value that has duplicates', () And('you fill the Child programme registration form with a first name with value that has duplicates', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .type('2021-01-01') .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(4) .type('Sarah') .blur(); }); And('you fill in the birth report date', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(7) .type('2023-01-01') .blur(); @@ -530,9 +530,9 @@ And('you see the form prefield with existing TEI attributes values', () => { cy.get('[data-test="registration-page-content"]').within(() => { cy.contains('New Enrollment in program: Child Programme').should('exist'); cy.contains('First name').should('exist'); - cy.get('[data-test="capture-ui-input"]').eq(4).should('have.value', 'Anna'); + cy.get('input[type="text"]').eq(4).should('have.value', 'Anna'); cy.contains('Last name').should('exist'); - cy.get('[data-test="capture-ui-input"]').eq(5).should('have.value', 'Jones'); + cy.get('input[type="text"]').eq(5).should('have.value', 'Jones'); cy.contains('Gender').should('exist'); cy.contains('Female').should('exist'); }); @@ -554,15 +554,15 @@ Given('you open the main page with Ngelehun and Malaria case diagnosis, treatmen }); And('you fill the Malaria case diagnosis registration form with values', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(3) .type(`Ana-${Math.round((new Date()).getTime() / 1000)}`) .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(4) .type(`Maria-${Math.round((new Date()).getTime() / 1000)}`) .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(5) .type(moment().add(-1, 'day').format('YYYY-MM-DD')) .blur(); @@ -602,26 +602,26 @@ Then('the first stage appears on registration page', () => { }); And('you fill the Child Program program registration form with unique values', () => { - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(1) .type('2021-01-01') .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(2) .type(20); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(3) .type(30) .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(4) .type(`Sarah-${Math.round((new Date()).getTime() / 1000)}`) .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(5) .type(`Beth-${Math.round((new Date()).getTime() / 1000)}`) .blur(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(7) .type('2021-01-01') .blur(); @@ -634,6 +634,9 @@ And('you see the enrollment minimap', () => { }); And('you delete the recently added tracked entity', () => { + cy.get('[data-test="profile-widget"]') + .contains('Person profile') + .should('exist'); cy.get('[data-test="widget-profile-overflow-menu"]') .click(); cy.contains('Delete Person') @@ -646,6 +649,9 @@ And('you delete the recently added tracked entity', () => { }); And('you delete the recently added malaria entity', () => { + cy.get('[data-test="profile-widget"]') + .contains('Malaria Entity profile') + .should('exist'); cy.get('[data-test="widget-profile-overflow-menu"]') .click(); cy.contains('Delete Malaria Entity') diff --git a/cypress/e2e/ScopeSelector/ScopeSelector.js b/cypress/e2e/ScopeSelector/ScopeSelector.js index c870644462..65bd9930f3 100644 --- a/cypress/e2e/ScopeSelector/ScopeSelector.js +++ b/cypress/e2e/ScopeSelector/ScopeSelector.js @@ -49,7 +49,7 @@ Given('you are in the main page with program preselected', () => { Given('you select both org unit and program Malaria case registration', () => { cy.get('[data-test="org-unit-selector-container"]') .click(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .type('Ngelehun C'); cy.contains('Ngelehun CHC') .click(); @@ -67,7 +67,7 @@ Given('you select both org unit and program Malaria case registration', () => { Given('you select both org unit and program Child Programme', () => { cy.get('[data-test="org-unit-selector-container"]') .click(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .type('Ngelehun C'); cy.contains('Ngelehun CHC') .click(); @@ -359,7 +359,7 @@ And('you see message explaining this is an Event program', () => { When('you select org unit that is incompatible with the already selected program', () => { cy.get('[data-test="org-unit-selector-container"]') .click(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .type('Biriw'); cy.contains('Biriwa') .click(); diff --git a/cypress/e2e/SearchForDuplicatesThroughAddRelationship/SearchForDuplicatesThroughAddRelationship.js b/cypress/e2e/SearchForDuplicatesThroughAddRelationship/SearchForDuplicatesThroughAddRelationship.js index 6ddaef31b1..8cbb6729d7 100644 --- a/cypress/e2e/SearchForDuplicatesThroughAddRelationship/SearchForDuplicatesThroughAddRelationship.js +++ b/cypress/e2e/SearchForDuplicatesThroughAddRelationship/SearchForDuplicatesThroughAddRelationship.js @@ -2,7 +2,7 @@ import { When, defineStep as And } from '@badeball/cypress-cucumber-preprocessor And('you fill in the first name with values that have duplicates', () => { cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .wait(500) .type('Tesmi') @@ -11,12 +11,12 @@ And('you fill in the first name with values that have duplicates', () => { And('you fill in the first name with values that have less than 5 duplicates', () => { cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Sarah') .blur(); cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(2) .type('Fis') .blur(); @@ -24,13 +24,13 @@ And('you fill in the first name with values that have less than 5 duplicates', ( And('you fill in the first name with values that have exactly 5 duplicates', () => { cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .wait(500) .type('Tesmi') .blur(); cy.get('[data-test="d2-section"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(2) .type('Abel') .blur(); diff --git a/cypress/e2e/SearchPage/SearchPage.js b/cypress/e2e/SearchPage/SearchPage.js index 19ff59af2d..829e87a571 100644 --- a/cypress/e2e/SearchPage/SearchPage.js +++ b/cypress/e2e/SearchPage/SearchPage.js @@ -21,7 +21,7 @@ When('you select the search domain Person', () => { Then('there should be Person domain forms available to search with', () => { cy.get('[data-test="search-page-content"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .should('have.length', 1); }); @@ -53,7 +53,7 @@ When('you select the search domain WHO RMNCH Tracker', () => { When('you fill in the unique identifier field with values that will not return a tracked entity instance', () => { cy.get('[data-test="form-unique"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .type('123') .blur(); @@ -85,7 +85,7 @@ When('you can close the modal', () => { When('you fill in the unique identifier field with values that will return a tracked entity instance', () => { cy.get('[data-test="form-unique"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .clear() .type('3131112445555') @@ -95,7 +95,7 @@ When('you fill in the unique identifier field with values that will return a tra When('you fill in the first name with values that will return no results', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .type('user non existing') .blur(); @@ -110,7 +110,7 @@ And('you expand the attributes search area', () => { When('you fill in the last name with values that will return results', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Smith') .blur(); @@ -118,7 +118,7 @@ When('you fill in the last name with values that will return results', () => { When('for Malaria case you fill in values that will return less than 5 results', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(2) .type('Sara') .blur(); @@ -126,12 +126,12 @@ When('for Malaria case you fill in values that will return less than 5 results', When('for Person you fill in values that will return less than 5 results', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Sara') .blur(); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Fis') .blur(); @@ -139,37 +139,37 @@ When('for Person you fill in values that will return less than 5 results', () => When('you dont fill in any of the values', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .clear(); }); When('you fill the values with nothing but spaces', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .type(' '); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type(' '); }); When('you fill in the the form with values', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Smith'); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Smith'); }); And(/^you fill in the the form with first name value: (.*)$/, (firstName) => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type(firstName) .blur(); @@ -177,14 +177,14 @@ And(/^you fill in the the form with first name value: (.*)$/, (firstName) => { When('you clear the values', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .clear(); cy.get('[data-test="form-attributes"]').click(); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .clear(); cy.get('[data-test="form-attributes"]').click(); @@ -235,7 +235,7 @@ Then('there should be visible a title with Malaria case diagnosis', () => { And('there should be Malaria case diagnosis forms visible to search with', () => { cy.get('[data-test="search-page-content"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .should('have.length', 1); }); @@ -245,12 +245,12 @@ Given('you are in the search page with the Adult Woman being preselected from th When('you fill in the date of birth', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(2) .type('1999-09-01') .blur(); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(3) .type('2020-01-01') .blur(); @@ -275,7 +275,7 @@ When('you fill in the zip code range numbers', () => { When('you fill in the first name', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Lid') .blur(); @@ -288,13 +288,13 @@ When('you click the fallback search button', () => { When('you fill in the first and last name with values that will return results', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Go') .blur(); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Sarah') .blur(); @@ -302,13 +302,13 @@ When('you fill in the first and last name with values that will return results', When('you press enter after filling in the first and last name with values that will return results', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Go') .blur(); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Sarah') .wait(500) @@ -317,7 +317,7 @@ When('you press enter after filling in the first and last name with values that When('you press enter after filling in the unique identifier field with values that will return a tracked entity instance', () => { cy.get('[data-test="form-unique"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .clear() .type('3131112445555{enter}'); @@ -325,13 +325,13 @@ When('you press enter after filling in the unique identifier field with values t When('you fill in the first name with value and last name with empty space', () => { cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Thomas') .blur(); cy.get('[data-test="form-attributes"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type(' ') .blur(); @@ -369,7 +369,7 @@ When('you see the attributes search area being expanded', () => { When('and you can see the unique identifier input', () => { cy.get('[data-test="form-unique"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .should('exist'); }); @@ -404,14 +404,14 @@ Then('you should be taken to the registration page with program with prefilled v .contains('New person in program: Child Programme') .should('exist'); cy.get('[data-test="registration-page-content"]').contains('First name').should('exist'); - cy.get('[data-test="capture-ui-input"]').eq(4).should('have.value', 'Sarah'); + cy.get('input[type="text"]').eq(4).should('have.value', 'Sarah'); cy.get('[data-test="registration-page-content"]').contains('Last name').should('exist'); - cy.get('[data-test="capture-ui-input"]').eq(5).should('have.value', 'Go'); + cy.get('input[type="text"]').eq(5).should('have.value', 'Go'); }); Then('you should be taken to the registration page without program with prefilled values', () => { cy.get('[data-test="registration-page-content"]').contains('First name').should('exist'); - cy.get('[data-test="capture-ui-input"]').eq(1).should('have.value', 'Sara'); + cy.get('input[type="text"]').eq(1).should('have.value', 'Sara'); cy.get('[data-test="registration-page-content"]').contains('Last name').should('exist'); - cy.get('[data-test="capture-ui-input"]').eq(2).should('have.value', 'Fis'); + cy.get('input[type="text"]').eq(2).should('have.value', 'Fis'); }); diff --git a/cypress/e2e/SearchThroughAddRelationship/SearchThroughAddRelationship.js b/cypress/e2e/SearchThroughAddRelationship/SearchThroughAddRelationship.js index 6ca75b0e34..89bc760ec7 100644 --- a/cypress/e2e/SearchThroughAddRelationship/SearchThroughAddRelationship.js +++ b/cypress/e2e/SearchThroughAddRelationship/SearchThroughAddRelationship.js @@ -21,7 +21,7 @@ When('you expand the third search area', () => { And('you fill in the first name with values that will return no results', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Name doesnt exist') .blur(); @@ -29,7 +29,7 @@ And('you fill in the first name with values that will return no results', () => And('you fill in the first name with values that will return results', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Tesmi') .blur(); @@ -49,23 +49,23 @@ And('there should be a validation error message', () => { And('you fill the values with nothing but spaces', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type(' '); cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type(' '); }); And('you fill in the the form with values', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Tesmi') .blur(); cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Tesmi') .blur(); @@ -73,18 +73,18 @@ And('you fill in the the form with values', () => { And('you clear the values', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .clear(); cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .clear(); }); And('you fill in the first name with values that will return an error', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .first() .type(',,,,') .blur(); @@ -104,12 +104,12 @@ And('the next page button is disabled', () => { And('you fill in the the form with values that will return less than 5 results', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Sara') .blur(); cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Gonzalez') .blur(); @@ -117,12 +117,12 @@ And('you fill in the the form with values that will return less than 5 results', And('you fill in the the form with values that will return exactly 5 results', () => { cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(0) .type('Tesmi') .blur(); cy.get('[data-test="d2-form-area"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .eq(1) .type('Abel') .blur(); diff --git a/cypress/e2e/TopBarActions/TopBarActions.js b/cypress/e2e/TopBarActions/TopBarActions.js index 624ca1ac82..521e5f4415 100644 --- a/cypress/e2e/TopBarActions/TopBarActions.js +++ b/cypress/e2e/TopBarActions/TopBarActions.js @@ -20,7 +20,7 @@ Then('the user sees the warning popup', () => { }); When(/^the user set the WHOMCH Diastolic blood pressure to (.*)/, score => - cy.get('[data-test="new-enrollment-event-form"]').find('[data-test="capture-ui-input"]').eq(6).clear() + cy.get('[data-test="new-enrollment-event-form"]').find('input[type="text"]').eq(6).clear() .type(score) .blur(), ); diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetAssignee/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetAssignee/index.js index 07403f7566..37b328ec17 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetAssignee/index.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetAssignee/index.js @@ -3,7 +3,7 @@ import { When, Then } from '@badeball/cypress-cucumber-preprocessor'; When('you assign the user Geetha in the view mode', () => { cy.get('[data-test="widget-assignee"]').within(() => { cy.get('[data-test="widget-assignee-assign"]').click(); - cy.get('[data-test="capture-ui-input"]').type('Geetha'); + cy.get('input[type="text"]').type('Geetha'); cy.contains('Geetha Alwan').click(); cy.get('[data-test="widget-assignee-save"]').click(); }); @@ -18,7 +18,7 @@ When('you assign the user Tracker demo User in the edit mode', () => { cy.get('[data-test="widget-assignee"]').within(() => { cy.get('[data-test="widget-assignee-edit"]').click(); cy.get('[data-test="dhis2-uicore-chip-remove"]').click(); - cy.get('[data-test="capture-ui-input"]').type('Tracker demo'); + cy.get('input[type="text"]').type('Tracker demo'); cy.contains('Tracker demo User').click(); cy.get('[data-test="widget-assignee-save"]').click(); }); diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js index 5303500a8d..9f4148abf9 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js @@ -250,7 +250,7 @@ Then(/^the user successfully transfers the enrollment/, () => { Then(/^the user types in (.*)/, (orgunit) => { cy.get('[data-test="widget-enrollment-transfer-modal"]').within(() => { - cy.get('[data-test="capture-ui-input"]').type(orgunit); + cy.get('input[type="text"]').type(orgunit); }); }); diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetProfile/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetProfile/index.js index 37328551ba..7dde4dcc06 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetProfile/index.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetProfile/index.js @@ -33,7 +33,7 @@ Then(/^the user sees the edit profile modal/, () => Given('you add a new tracked entity in the Malaria focus investigation program', () => { cy.visit('/#/new?programId=M3xtLkYBlKI&orgUnitId=DiszpKrYNg8'); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .eq(2) .type(`Local id-${Math.round((new Date()).getTime() / 1000)}`) .blur(); diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetTab/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetTab/index.js index 036671a649..07d8f01448 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetTab/index.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetTab/index.js @@ -24,6 +24,6 @@ Then('you should see Schedule tab', () => { And(/you should see suggested date: (.*)/, (date) => { cy.get('[data-test="schedule-section"]').within(() => { - cy.get('[data-test="capture-ui-input"]').should('have.value', `${getCurrentYear()}-${date}`); + cy.get('input[type="text"]').should('have.value', `${getCurrentYear()}-${date}`); }); }); diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage/WidgetsForEnrollmentAddEventPage.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage/WidgetsForEnrollmentAddEventPage.js index 24f07d7593..5aa738ee44 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage/WidgetsForEnrollmentAddEventPage.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentAddEventPage/WidgetsForEnrollmentAddEventPage.js @@ -6,8 +6,8 @@ import '../WidgetTab'; Then('you can assign a user when scheduling the event', () => { cy.get('[data-test="assignee-section"]').within(() => { - cy.get('[data-test="capture-ui-input"]').click(); - cy.get('[data-test="capture-ui-input"]').type('Tracker demo'); + cy.get('input[type="text"]').click(); + cy.get('input[type="text"]').type('Tracker demo'); cy.contains('Tracker demo User').click(); }); cy.get('[data-test="assignee-section"]').within(() => { diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.js index 96a583bd38..b6efc6f7df 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentDashboard/WidgetsForEnrollmentDashboard.js @@ -6,14 +6,14 @@ import '../WidgetProfile'; import '../WidgetEnrollmentNote'; When('the user sets the birthday date to the current date', () => { - cy.get('[data-test="modal-edit-profile"]').find('[data-test="capture-ui-input"]').eq(8).clear() + cy.get('[data-test="modal-edit-profile"]').find('input[type="text"]').eq(8).clear() .blur() .type(moment().format('YYYY-MM-DD')) .blur(); }); When(/^the user sets the first name to (.*)$/, (name) => { - cy.get('[data-test="modal-edit-profile"]').find('[data-test="capture-ui-input"]').eq(1).clear() + cy.get('[data-test="modal-edit-profile"]').find('input[type="text"]').eq(1).clear() .blur() .type(name) .blur(); diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEventSchedule/WidgetsForEventSchedule.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEventSchedule/WidgetsForEventSchedule.js index 3896685c41..1e0d6a4f4e 100644 --- a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEventSchedule/WidgetsForEventSchedule.js +++ b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEventSchedule/WidgetsForEventSchedule.js @@ -5,8 +5,8 @@ import '../WidgetTab'; Then('you choose a schedule date', () => { cy.get('[data-test="schedule-section"]').within(() => { - cy.get("[data-test='capture-ui-input']").eq(0).should('have.value', `${getCurrentYear()}-08-01`); - cy.get("[data-test='capture-ui-input']").eq(0) + cy.get('input[type="text"]').eq(0).should('have.value', `${getCurrentYear()}-08-01`); + cy.get('input[type="text"]').eq(0) .clear() .type(`${getCurrentYear() + 1}-08-01`) .blur(); diff --git a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js index 0ea736c26a..04f0af84b7 100644 --- a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js +++ b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js @@ -723,7 +723,7 @@ Then('the TEI working list initial configuration was kept', () => { And('you change the org unit', () => { cy.get('[data-test="org-unit-selector-container"]') .click(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .type('Njandama MCHP'); cy.contains('Njandama MCHP') .click(); diff --git a/cypress/support/step_definitions/common/baseSteps.js b/cypress/support/step_definitions/common/baseSteps.js index a4db6e4a30..c4122b51cc 100644 --- a/cypress/support/step_definitions/common/baseSteps.js +++ b/cypress/support/step_definitions/common/baseSteps.js @@ -22,7 +22,7 @@ And('you see the dropdown menu for selecting tracked entity type', () => { And('you select org unit', () => { cy.get('[data-test="org-unit-selector-container"]') .click(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .type('Ngelehun C'); cy.contains('Ngelehun CHC') .click(); @@ -36,7 +36,7 @@ Then('there should be visible a title with Child Program', () => { And('there should be Child Programme domain forms visible to search with', () => { cy.get('[data-test="search-page-content"]') - .find('[data-test="capture-ui-input"]') + .find('input[type="text"]') .should('have.length', 1); }); @@ -176,7 +176,7 @@ When(/^the user selects the program (.*)$/, (program) => { When(/^the user selects the org unit (.*)$/, (orgUnit) => { cy.get('[data-test="org-unit-selector-container"]') .click(); - cy.get('[data-test="capture-ui-input"]') + cy.get('input[type="text"]') .type(orgUnit.slice(0, -1)); cy.contains(orgUnit) .click(); diff --git a/flow-typed/npm/query-string_v6.x.x.js b/flow-typed/npm/query-string_v6.x.x.js deleted file mode 100644 index 837d96d34c..0000000000 --- a/flow-typed/npm/query-string_v6.x.x.js +++ /dev/null @@ -1,42 +0,0 @@ -// flow-typed signature: 4a4ede4f7f12b874598b0b727b9a1c4c -// flow-typed version: f898dad1b0/query-string_v6.x.x/flow_>=v0.104.x - -declare module 'query-string' { - declare type ArrayFormat = 'none' | 'bracket' | 'index' | 'comma' - declare type ParseOptions = {| - arrayFormat?: ArrayFormat, - decode?: boolean, - sort?: false | (A, B) => number, - parseNumbers?: boolean, - parseBooleans?: boolean, - |} - - declare type StringifyOptions = {| - arrayFormat?: ArrayFormat, - encode?: boolean, - strict?: boolean, - sort?: false | (A, B) => number, - skipNull?: boolean, - |} - - declare type ObjectParameter = string | number | boolean | null | void; - - declare type ObjectParameters = $ReadOnly<{ [string]: ObjectParameter | $ReadOnlyArray, ... }> - - declare type QueryParameters = { [string]: string | Array | null, ... } - - declare type StringifyObjectParameter = {| url: string, query?: QueryParameters |} - - declare module.exports: { - extract(str: string): string, - parse(str: string, opts?: ParseOptions): QueryParameters, - parseUrl(str: string, opts?: ParseOptions): { - url: string, - query: QueryParameters, - ... - }, - stringify(obj: ObjectParameters, opts?: StringifyOptions): string, - stringifyUrl(obj: StringifyObjectParameter, opts?: StringifyOptions): string, - ... - } -} diff --git a/flow-typed/npm/query-string_v9.x.x.js b/flow-typed/npm/query-string_v9.x.x.js new file mode 100644 index 0000000000..c242d25b12 --- /dev/null +++ b/flow-typed/npm/query-string_v9.x.x.js @@ -0,0 +1,23 @@ +// flow-typed signature: ec1d99909d639f153164cf55049d63b2 +// flow-typed version: <>/query-string_v^9.1.1/flow_v0.132.0 + +/** + * This is an autogenerated libdef stub for: + * + * 'query-string' + * + * 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 'query-string' { + declare type QueryParameters = { [string]: string | Array | null, ... } + + declare module.exports: { + parse(str: string, opts?: any): QueryParameters, + ... + } +} diff --git a/i18n/ar.po b/i18n/ar.po index bd06150d1f..a10f40cf6b 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Hamza Assada <7amza.it@gmail.com>, 2024\n" "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n" @@ -45,6 +45,39 @@ msgstr "" "الصفحة إذا كنت ترغب في استخدام هذه النسخة، ولكن اعلم أن هذا سيؤدي إلى إغلاق " "النسخ الأخرى." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "تعديل الحدث" + +msgid "New event" +msgstr "حدث جديد" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "البحث" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "مزيد" @@ -300,9 +333,6 @@ msgstr "نعم ، تجاهل التغييرات" msgid "No, cancel" msgstr "لا، الغاء" -msgid "New event" -msgstr "حدث جديد" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -521,9 +551,6 @@ msgstr "اكتب لتصفية الخيارات" msgid "No match found" msgstr "" -msgid "Search" -msgstr "البحث" - msgid "Clear" msgstr "مسح" @@ -681,7 +708,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -856,9 +885,6 @@ msgstr "حدث" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "تعديل الحدث" - msgid "View changelog" msgstr "" @@ -894,15 +920,6 @@ msgstr "تعذر تحميل الحدث" msgid "Organisation unit could not be loaded" msgstr "تعذر تحميل الوحدة التنظيمية" -msgid "Dashboard" -msgstr "لوحة المعلومات" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "البرنامج المحدد" @@ -933,6 +950,9 @@ msgstr "جار التحميل" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "إحتمال وجود تكرار" @@ -1073,7 +1093,7 @@ msgstr "" msgid "Assigned to" msgstr "مسندة إلى" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1082,7 +1102,7 @@ msgstr "تعديل" msgid "No one is assigned to this event" msgstr "لم يتم تعيين أي شخص لهذا الحدث" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1256,6 +1276,9 @@ msgstr "تحذير" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "حذف الحدث" @@ -1274,9 +1297,6 @@ msgstr "الحدث مكتمل" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1484,10 +1504,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1523,6 +1551,12 @@ msgstr "" msgid "Value" msgstr "القيمة" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1583,6 +1617,46 @@ msgstr "تنزيل البيانات" msgid "an error occurred loading working lists" msgstr "حدث خطأ اثناء تحميل قوائم العمل" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "تاريخ التسجيل" @@ -1598,13 +1672,152 @@ msgstr "متابعة" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1616,6 +1829,18 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "تحديث العرض" diff --git a/i18n/ar_IQ.po b/i18n/ar_IQ.po index f818d29a25..a599e064d5 100644 --- 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-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: KRG HIS , 2024\n" "Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n" @@ -42,6 +42,39 @@ msgstr "" "الصفحة إذا كنت ترغب في استخدام هذه النسخة، ولكن اعلم أن هذا سيؤدي إلى إغلاق " "النسخ الأخرى." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "تعديل الحدث" + +msgid "New event" +msgstr "حدث جديد" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "البحث" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -297,9 +330,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "حدث جديد" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -518,9 +548,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "البحث" - msgid "Clear" msgstr "مسح" @@ -678,7 +705,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -853,9 +882,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "تعديل الحدث" - msgid "View changelog" msgstr "" @@ -891,15 +917,6 @@ msgstr "تعذر تحميل الحدث" msgid "Organisation unit could not be loaded" msgstr "تعذر تحميل الوحدة التنظيمية" -msgid "Dashboard" -msgstr "لوحة المعلومات" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "البرنامج المحدد" @@ -930,6 +947,9 @@ msgstr "جار التحميل" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "إحتمال وجود تكرار" @@ -1068,7 +1088,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1077,7 +1097,7 @@ msgstr "تعديل" msgid "No one is assigned to this event" msgstr "لم يتم تعيين أي شخص لهذا الحدث" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1251,6 +1271,9 @@ msgstr "تحذير" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "حذف الحدث" @@ -1269,9 +1292,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1479,10 +1499,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1518,6 +1546,12 @@ msgstr "" msgid "Value" msgstr "القيمة" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1578,6 +1612,46 @@ msgstr "تنزيل البيانات" msgid "an error occurred loading working lists" msgstr "حدث خطأ اثناء تحميل قوائم العمل" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1593,13 +1667,152 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1611,6 +1824,18 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "تحديث العرض" diff --git a/i18n/ckb.po b/i18n/ckb.po index 54b435b433..53cbcbe935 100644 --- a/i18n/ckb.po +++ b/i18n/ckb.po @@ -2,13 +2,12 @@ # Translators: # Antonia Bezenchek , 2021 # KRG HIS , 2021 -# Philip Larsen Donnelly, 2024 # Viktor Varland , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Central Kurdish (https://app.transifex.com/hisp-uio/teams/100509/ckb/)\n" @@ -45,6 +44,39 @@ msgstr "" "تکایە پەیجەکەت ریفرێش بکەوە بۆ ئەوەی ئەم وەشانە بکەیتەوە بەڵام ئاگاداربکە " "ئەم کردارە وەشانەکانیتر دادەخات" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "حاڵەتەکە دەستکاری بکە" + +msgid "New event" +msgstr "رووداوي نوي" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "گەڕان" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -301,9 +333,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "رووداوي نوي" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -523,9 +552,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "گەڕان" - msgid "Clear" msgstr "پاککردنەوە" @@ -683,7 +709,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -858,9 +886,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "حاڵەتەکە دەستکاری بکە" - msgid "View changelog" msgstr "" @@ -898,15 +923,6 @@ msgstr "حاڵەتەکە نەتواندرا بهێندرێت" msgid "Organisation unit could not be loaded" msgstr "ئۆرگانیزەیشن یونتەکە نەتواندرا بهێندرێت" -msgid "Dashboard" -msgstr "شيتةل كردني داتا" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "پرۆگرامە هەڵبژێردراوەکە" @@ -933,6 +949,9 @@ msgstr "" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "ڕەنگە دووبارەبوونەوە دۆزرابێتەوە" @@ -1071,7 +1090,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1080,7 +1099,7 @@ msgstr "دةستكاري" msgid "No one is assigned to this event" msgstr "هیچ کەسێک بۆ ئەم حاڵەتە رانەسپێردراوە" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1254,6 +1273,9 @@ msgstr "" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "حاڵەتەکە بسڕەوە" @@ -1272,9 +1294,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1470,10 +1489,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1509,6 +1536,12 @@ msgstr "" msgid "Value" msgstr "بةها" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1569,6 +1602,46 @@ msgstr "زانیاریەکان دابەزێنە" msgid "an error occurred loading working lists" msgstr "هەڵەیەک ڕوویدا لە هێنانی لیستی کارکردن" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1584,13 +1657,120 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1602,6 +1782,14 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "پیشاندان نوێبکەوە" diff --git a/i18n/cs.po b/i18n/cs.po index 39571615b5..11fcec5cf7 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Jiří Podhorecký , 2024\n" "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n" @@ -43,6 +43,39 @@ msgstr "" "doméně). Chcete-li tuto verzi znovu použít, obnovte prosím tuto stránku, " "mějte však na paměti, že se tím zavřou další verze." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Upravit událost" + +msgid "New event" +msgstr "Nová událost" + +msgid "Active enrollments" +msgstr "Aktivní zápisy" + +msgid "Completed enrollments" +msgstr "Dokončené zápisy" + +msgid "Cancelled enrollments" +msgstr "Zrušené zápisy" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Hledat" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Více" @@ -298,9 +331,6 @@ msgstr "Ano, zahodit změny" msgid "No, cancel" msgstr "Ne, zrušit" -msgid "New event" -msgstr "Nová událost" - msgid "You don't have access to create an event in the current selections" msgstr "V aktuálním výběru nemáte přístup k vytvoření události" @@ -523,9 +553,6 @@ msgstr "Zadáním filtrujete možnosti" msgid "No match found" msgstr "Žádná shoda nenalezena" -msgid "Search" -msgstr "Hledat" - msgid "Clear" msgstr "Vyčistit" @@ -871,9 +898,6 @@ msgstr "událost" msgid "You don't have access to edit this event" msgstr "Nemáte přístup k úpravám této události" -msgid "Edit event" -msgstr "Upravit událost" - msgid "View changelog" msgstr "Zobrazit seznam změn" @@ -911,15 +935,6 @@ msgstr "Událost se nepodařilo načíst" msgid "Organisation unit could not be loaded" msgstr "Organizační jednotku se nepodařilo načíst" -msgid "Dashboard" -msgstr "Ovládací panel" - -msgid "Edit Event" -msgstr "Upravit událost" - -msgid "View Event" -msgstr "Zobrazit událost" - msgid "Selected program" msgstr "Vybraný program" @@ -948,6 +963,9 @@ msgstr "načítání" msgid "An error occurred while loading the form" msgstr "Při načítání formuláře došlo k chybě" +msgid "Back to all stages and events" +msgstr "Zpět ke všem fázím a událostem" + msgid "Possible duplicates found" msgstr "Byly nalezeny možné duplikáty" @@ -1287,6 +1305,9 @@ msgstr "Varování" msgid "stage not found in rules execution" msgstr "fáze nebyla nalezena v provádění pravidel" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Smazat událost" @@ -1305,9 +1326,6 @@ msgstr "Událost dokončena" msgid "The event cannot be edited after it has been completed" msgstr "Událost nelze upravovat po jejím dokončení." -msgid "Back to all stages and events" -msgstr "Zpět ke všem fázím a událostem" - msgid "Notes about this event" msgstr "Poznámky k této události" @@ -1523,11 +1541,19 @@ msgstr "{{ scheduledEvents }} naplánováno" msgid "Stages and Events" msgstr "Fáze a události" +msgid "View linked event" +msgstr "Zobrazit propojenou událost" + msgid "An error occurred while loading the widget." msgstr "Při načítání widgetu došlo k chybě." -msgid "View linked event" -msgstr "Zobrazit propojenou událost" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" +msgstr "" msgid "Scheduled" msgstr "Naplánováno" @@ -1562,6 +1588,12 @@ msgstr "Změna" msgid "Value" msgstr "Hodnota" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Nový vztah {{trackedEntityTypeName}} " @@ -1624,6 +1656,46 @@ msgstr "Stáhnout data ..." msgid "an error occurred loading working lists" msgstr "při načítání pracovních seznamů došlo k chybě" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Datum registrace" @@ -1639,14 +1711,137 @@ msgstr "Následovat" msgid "Choose a program stage to filter by {{label}}" msgstr "Vyberte fázi programu, kterou chcete filtrovat podle {{label}}" -msgid "Active enrollments" -msgstr "Aktivní zápisy" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "Dokončené zápisy" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "Zrušené zápisy" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "Pracovní seznam nelze aktualizovat" @@ -1657,6 +1852,16 @@ msgstr "došlo k chybě při načítání pracovních seznamů" msgid "an error occurred loading Tracked entity instance lists" msgstr "došlo k chybě při načítání seznamů instancí trasovaných entit" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "Aktualizovat zobrazení" diff --git a/i18n/da.po b/i18n/da.po index 254ea3696e..d01b1453cb 100644 --- a/i18n/da.po +++ b/i18n/da.po @@ -1,13 +1,13 @@ # # Translators: -# Philip Larsen Donnelly, 2024 +# Philip Larsen Donnelly, 2022 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2022\n" "Language-Team: Danish (https://app.transifex.com/hisp-uio/teams/100509/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,6 +36,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -288,9 +321,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -504,9 +534,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "" - msgid "Clear" msgstr "Clear" @@ -606,42 +633,6 @@ msgstr "" msgid "Close the notice" msgstr "" -msgid "Use new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt in for {{programName}}" -msgstr "" - -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 "" - -msgid "Stop using new Enrollment dashboard for {{programName}}" -msgstr "" - -msgid "Opt out for {{programName}}" -msgstr "" - msgid "Enrollment with id \"{{enrollmentId}}\" does not exist" msgstr "" @@ -700,7 +691,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -729,9 +722,6 @@ msgstr "" msgid "Page is missing required values from URL" msgstr "" -msgid "Program is not valid" -msgstr "" - msgid "Org unit is not valid with current program" msgstr "" @@ -878,9 +868,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -916,15 +903,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "Dashboard" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "" @@ -951,6 +929,9 @@ msgstr "" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1089,7 +1070,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1098,7 +1079,7 @@ msgstr "" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1144,6 +1125,9 @@ msgstr "" msgid "Mark incomplete" msgstr "" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "" @@ -1224,6 +1208,12 @@ msgstr "" msgid "Follow-up" msgstr "" +msgid "Started at{{escape}}" +msgstr "" + +msgid "Owned by{{escape}}" +msgstr "" + msgid "Cancelled" msgstr "" @@ -1263,6 +1253,9 @@ msgstr "Warning" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1281,9 +1274,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1412,11 +1402,6 @@ msgstr "" msgid "Ambiguous relationships, contact system administrator" msgstr "" -msgid "" -"Enter {{linkableStageLabel}} details in the next step after completing this " -"{{currentStageLabel}}." -msgstr "" - msgid "Enter details now" msgstr "" @@ -1484,10 +1469,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1499,6 +1492,9 @@ msgstr "" msgid "No changes to display" msgstr "" +msgid "Updated" +msgstr "" + msgid "Created" msgstr "" @@ -1517,6 +1513,15 @@ msgstr "" msgid "Change" msgstr "" +msgid "Value" +msgstr "" + +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1577,6 +1582,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1592,13 +1637,120 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1610,6 +1762,14 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "" diff --git a/i18n/en.pot b/i18n/en.pot index ac90d8b3c5..408412aee8 100644 --- 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-12-02T11:16:49.543Z\n" -"PO-Revision-Date: 2024-12-02T11:16:49.543Z\n" +"POT-Creation-Date: 2024-12-05T14:15:36.330Z\n" +"PO-Revision-Date: 2024-12-05T14:15:36.330Z\n" msgid "Choose one or more dates..." msgstr "Choose one or more dates..." @@ -113,66 +113,6 @@ msgstr "This value is validating" msgid "Async field update failed" msgstr "Async field update failed" -msgid "A value is required" -msgstr "A value is required" - -msgid "Please provide a valid number" -msgstr "Please provide a valid number" - -msgid "Please provide a valid integer" -msgstr "Please provide a valid integer" - -msgid "Please provide a positive integer" -msgstr "Please provide a positive integer" - -msgid "Please provide zero or a positive integer" -msgstr "Please provide zero or a positive integer" - -msgid "Please provide a negative integer" -msgstr "Please provide a negative integer" - -msgid "Please provide a valid date" -msgstr "Please provide a valid date" - -msgid "A date in the future is not allowed" -msgstr "A date in the future is not allowed" - -msgid "Please provide a valid date and time" -msgstr "Please provide a valid date and time" - -msgid "Please provide a valid time" -msgstr "Please provide a valid time" - -msgid "Please provide an integer between 0 and 100" -msgstr "Please provide an integer between 0 and 100" - -msgid "Please provide a valid url" -msgstr "Please provide a valid url" - -msgid "Please provide a valid email address" -msgstr "Please provide a valid email address" - -msgid "Please provide a valid age" -msgstr "Please provide a valid age" - -msgid "Please provide a valid phone number" -msgstr "Please provide a valid phone number" - -msgid "Please provide a valid organisation unit" -msgstr "Please provide a valid organisation unit" - -msgid "Please provide valid coordinates" -msgstr "Please provide valid coordinates" - -msgid "This value already exists" -msgstr "This value already exists" - -msgid "\"From\" cannot be greater than \"To\"" -msgstr "\"From\" cannot be greater than \"To\"" - -msgid "Checking..." -msgstr "Checking..." - msgid "Area" msgstr "Area" @@ -185,6 +125,12 @@ msgstr "Enrollment" msgid "Complete event" msgstr "Complete event" +msgid "A value is required" +msgstr "A value is required" + +msgid "Please provide a valid date" +msgstr "Please provide a valid date" + msgid "{{ stageName }} - Basic info" msgstr "{{ stageName }} - Basic info" @@ -197,8 +143,8 @@ msgstr "{{ stageName }} - Status" msgid "Please select {{categoryName}}" msgstr "Please select {{categoryName}}" -msgid "A future date is not allowed" -msgstr "A future date is not allowed" +msgid "A date in the future is not allowed" +msgstr "A date in the future is not allowed" msgid "Saving a new enrollment in {{programName}} in {{orgUnitName}}." msgstr "Saving a new enrollment in {{programName}} in {{orgUnitName}}." @@ -1201,6 +1147,9 @@ msgstr "Set coordinates" msgid "Coordinates" msgstr "Coordinates" +msgid "Please provide valid coordinates" +msgstr "Please provide valid coordinates" + msgid "Delete polygon" msgstr "Delete polygon" @@ -1421,6 +1370,9 @@ msgstr "There was a problem deleting the {{trackedEntityTypeName}}" msgid "Yes, delete {{trackedEntityTypeName}}" msgstr "Yes, delete {{trackedEntityTypeName}}" +msgid "View changelog ok" +msgstr "View changelog ok" + msgid "Profile widget could not be loaded. Please try again later" msgstr "Profile widget could not be loaded. Please try again later" @@ -1460,6 +1412,12 @@ msgstr "Scheduled date" msgid "Report date" msgstr "Report date" +msgid "Please enter a date" +msgstr "Please enter a date" + +msgid "Please provide a valid organisation unit" +msgstr "Please provide a valid organisation unit" + msgid "Please select a valid event" msgstr "Please select a valid event" @@ -1936,6 +1894,60 @@ msgstr "Error editing the event, the changes made were not saved" msgid "Error updating the Assignee" msgstr "Error updating the Assignee" +msgid "Please provide a valid number" +msgstr "Please provide a valid number" + +msgid "Please provide a valid integer" +msgstr "Please provide a valid integer" + +msgid "Please provide a positive integer" +msgstr "Please provide a positive integer" + +msgid "Please provide zero or a positive integer" +msgstr "Please provide zero or a positive integer" + +msgid "Please provide a negative integer" +msgstr "Please provide a negative integer" + +msgid "Please provide a valid date and time" +msgstr "Please provide a valid date and time" + +msgid "Please provide a valid time" +msgstr "Please provide a valid time" + +msgid "Please provide an integer between 0 and 100" +msgstr "Please provide an integer between 0 and 100" + +msgid "Please provide a valid url" +msgstr "Please provide a valid url" + +msgid "Please provide a valid email address" +msgstr "Please provide a valid email address" + +msgid "Please provide a valid age" +msgstr "Please provide a valid age" + +msgid "Please provide a valid phone number" +msgstr "Please provide a valid phone number" + +msgid "This value already exists" +msgstr "This value already exists" + +msgid "\"From\" cannot be greater than \"To\"" +msgstr "\"From\" cannot be greater than \"To\"" + +msgid "Checking..." +msgstr "Checking..." + +msgid "Please provide a valid positive integer" +msgstr "Please provide a valid positive integer" + +msgid "Please enter a valid time" +msgstr "Please enter a valid time" + +msgid "Please enter a time" +msgstr "Please enter a time" + msgid "Set coordinate" msgstr "Set coordinate" diff --git a/i18n/es.po b/i18n/es.po index 301f636658..8aa41fa115 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -15,13 +15,14 @@ # Juan M Alcantara Acosta , 2024 # Manuel Silva , 2024 # Philip Larsen Donnelly, 2024 +# Milagros Rodríguez, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Milagros Rodríguez, 2024\n" "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,6 +58,39 @@ msgstr "" "desea utilizar esta versión nuevamente, pero tenga en cuenta que esto " "cerrará otras versiones." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Editar evento" + +msgid "New event" +msgstr "Evento nuevo" + +msgid "Active enrollments" +msgstr "Inscripciones activas" + +msgid "Completed enrollments" +msgstr "Inscripciónes completadas" + +msgid "Cancelled enrollments" +msgstr "Inscripciones canceladas " + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Buscar" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Más" @@ -316,9 +350,6 @@ msgstr "Sí, descartar cambios" msgid "No, cancel" msgstr "No, cancelar" -msgid "New event" -msgstr "Evento nuevo" - msgid "You don't have access to create an event in the current selections" msgstr "No tiene acceso para crear un evento en las selecciones actuales" @@ -543,9 +574,6 @@ msgstr "Escriba para filtrar opciones" msgid "No match found" msgstr "No se encontraron coincidencias" -msgid "Search" -msgstr "Buscar" - msgid "Clear" msgstr "Limpiar" @@ -898,9 +926,6 @@ msgstr "evento" msgid "You don't have access to edit this event" msgstr "No tiene acceso para editar este evento" -msgid "Edit event" -msgstr "Editar evento" - msgid "View changelog" msgstr "Ver registro de cambios" @@ -938,15 +963,6 @@ msgstr "No se pudo cargar el evento" msgid "Organisation unit could not be loaded" msgstr "No se pudo cargar la unidad organizativa" -msgid "Dashboard" -msgstr "Tablero" - -msgid "Edit Event" -msgstr "Editar evento" - -msgid "View Event" -msgstr "Ver evento" - msgid "Selected program" msgstr "Programa seleccionado" @@ -975,6 +991,9 @@ msgstr "Cargando" msgid "An error occurred while loading the form" msgstr "Ocurrió un error al cargar el formulario" +msgid "Back to all stages and events" +msgstr "Volver a todas las etapas y eventos" + msgid "Possible duplicates found" msgstr "Posibles duplicados encontrados" @@ -1326,6 +1345,9 @@ msgstr "Advertencia" msgid "stage not found in rules execution" msgstr "etapa no encontrada en la ejecución de reglas" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Eliminar evento" @@ -1345,9 +1367,6 @@ msgstr "Evento completado" msgid "The event cannot be edited after it has been completed" msgstr "El evento no admite cambios después de haber sido completado" -msgid "Back to all stages and events" -msgstr "Volver a todas las etapas y eventos" - msgid "Notes about this event" msgstr "Notas sobre este acto" @@ -1570,11 +1589,19 @@ msgstr "{{ scheduledEvents }} programado(s)" msgid "Stages and Events" msgstr "Etapas y eventos" +msgid "View linked event" +msgstr "Ver eventos relacionados" + msgid "An error occurred while loading the widget." msgstr "Ha ocurrido un error al cargar el componente" -msgid "View linked event" -msgstr "Ver eventos relacionados" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" +msgstr "" msgid "Scheduled" msgstr "Planificado" @@ -1609,6 +1636,12 @@ msgstr "Cambio" msgid "Value" msgstr "Valor" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Nueva relación de {{trackedEntityTypeName}}" @@ -1675,6 +1708,46 @@ msgstr "Descargar datos" msgid "an error occurred loading working lists" msgstr "se produjo un error al cargar listas de trabajo" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "Se ha producido un error desconocido." + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Fecha de registro" @@ -1690,14 +1763,129 @@ msgstr "Seguimiento" msgid "Choose a program stage to filter by {{label}}" msgstr "Elija una etapa del programa para filtrar por {{label}}" -msgid "Active enrollments" -msgstr "Inscripciones activas" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "Inscripciónes completadas" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "Inscripciones canceladas " +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "No se pudo actualizar la lista de trabajo" @@ -1710,6 +1898,15 @@ msgstr "" "se produjo un error al cargar las listas de instancias de entidades " "rastreadas" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "Actualizar vista" diff --git a/i18n/fr.po b/i18n/fr.po index 3effbc2fc8..33af49bc75 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Jason Pickering , 2024\n" "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n" @@ -54,6 +54,39 @@ msgstr "" "cette page si vous souhaitez utiliser à nouveau cette version, mais " "attention, cette opération entraînera la fermeture des autres versions." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Modifier un événement" + +msgid "New event" +msgstr "Nouvel événement" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Chercher" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Plus" @@ -316,9 +349,6 @@ msgstr "Oui, annuler les modifications" msgid "No, cancel" msgstr "Non, annuler" -msgid "New event" -msgstr "Nouvel événement" - msgid "You don't have access to create an event in the current selections" msgstr "" "Vous n'avez pas accès pour créer un événement dans les sélections actuelles" @@ -541,9 +571,6 @@ msgstr "" msgid "No match found" msgstr "Pas de résultat trouvé" -msgid "Search" -msgstr "Chercher" - msgid "Clear" msgstr "Effacer" @@ -707,7 +734,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -889,9 +918,6 @@ msgstr "événement" msgid "You don't have access to edit this event" msgstr "Vous n'êtes pas autorisé à modifier cet événement" -msgid "Edit event" -msgstr "Modifier un événement" - msgid "View changelog" msgstr "" @@ -928,15 +954,6 @@ msgstr "L'événement n'a pas pu être chargé" msgid "Organisation unit could not be loaded" msgstr "L'unité d'organisation n'a pas pu être chargée" -msgid "Dashboard" -msgstr "Tableau de bord" - -msgid "Edit Event" -msgstr "Modifier l'événement" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Programme choisi" @@ -964,6 +981,9 @@ msgstr "Chargement" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "Retour à tous les stades et événements" + msgid "Possible duplicates found" msgstr "Doublons éventuellement détectés" @@ -1116,7 +1136,7 @@ msgstr "" msgid "Assigned to" msgstr "Attribue" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1125,7 +1145,7 @@ msgstr "Modifier" msgid "No one is assigned to this event" msgstr "Personne n'est affecté à cet événement" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1171,6 +1191,9 @@ msgstr "Marquer comme annulé" msgid "Mark incomplete" msgstr "Mark comme inachevé" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Supprimer enrôlement" @@ -1301,6 +1324,9 @@ msgstr "Attention" msgid "stage not found in rules execution" msgstr "stade non trouvé lors de l'exécution des règles" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Effacer l´événement" @@ -1321,9 +1347,6 @@ msgstr "Événement terminé" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "Retour à tous les stades et événements" - msgid "Notes about this event" msgstr "" @@ -1538,10 +1561,18 @@ msgstr "{{ scheduledEvents }} programmé" msgid "Stages and Events" msgstr "Étapes et événements" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1575,6 +1606,12 @@ msgid "Change" msgstr "Modifier" msgid "Value" +msgstr "Valeur" + +msgid "File" +msgstr "" + +msgid "Image" msgstr "" msgid "New {{trackedEntityTypeName}} relationship" @@ -1637,6 +1674,46 @@ msgstr "Télécharger des données..." msgid "an error occurred loading working lists" msgstr "une erreur est survenue lors du chargement des listes de tâches" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Date d'inscription" @@ -1652,13 +1729,128 @@ msgstr "Suivi" msgid "Choose a program stage to filter by {{label}}" msgstr "Choisir un stade de programme pour filtrer par {{label}}" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1672,6 +1864,15 @@ msgstr "" "une erreur s'est produite lors du chargement des listes d'instances " "d'entités suivies" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "Mettre à jour la vue" diff --git a/i18n/id.po b/i18n/id.po index 1cf72fa6a2..65a9ebd421 100644 --- a/i18n/id.po +++ b/i18n/id.po @@ -5,7 +5,6 @@ # Farida Sibuea , 2023 # Philip Larsen Donnelly, 2024 # Untoro Dwi Raharjo , 2024 -# ratih syabrina, 2024 # Yusuf Setiawan , 2024 # Guardian Sanjaya , 2024 # Aprisa Chrysantina , 2024 @@ -14,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Viktor Varland , 2024\n" "Language-Team: Indonesian (https://app.transifex.com/hisp-uio/teams/100509/id/)\n" @@ -52,6 +51,39 @@ msgstr "" "menggunakan versi ini lagi, tetapi perlu diketahui bahwa ini akan menutup " "versi lain." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Sunting even" + +msgid "New event" +msgstr "Event baru" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Pencarian" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Lagi" @@ -309,9 +341,6 @@ msgstr "Ya, hapus perubahan" msgid "No, cancel" msgstr "tidak, batalkan" -msgid "New event" -msgstr "Event baru" - msgid "You don't have access to create an event in the current selections" msgstr "Anda tidak memiliki akses untuk membuat even di pilihan saat ini" @@ -528,9 +557,6 @@ msgstr "Tipe opsi filter" msgid "No match found" msgstr "tidak ditemukan data yang sesuai" -msgid "Search" -msgstr "Pencarian" - msgid "Clear" msgstr "Hapus" @@ -690,7 +716,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -869,9 +897,6 @@ msgstr "acara/peristiwa" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "Sunting even" - msgid "View changelog" msgstr "" @@ -909,15 +934,6 @@ msgstr "Even tidak dapat dimuat" msgid "Organisation unit could not be loaded" msgstr "Unit organisasi tidak dapat dimuat" -msgid "Dashboard" -msgstr "Dasbor" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Program yang dipilih" @@ -943,6 +959,9 @@ msgstr "Loading" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "Kemungkinan duplikat ditemukan" @@ -1087,7 +1106,7 @@ msgstr "" msgid "Assigned to" msgstr "Ditugaskan pada" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1096,7 +1115,7 @@ msgstr "Sunting" msgid "No one is assigned to this event" msgstr "Tidak ada yang ditugaskan untuk even ini" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1142,6 +1161,9 @@ msgstr "Tandai sebagai dibatalkan" msgid "Mark incomplete" msgstr "Tandai tidak lengkap" +msgid "You do not have access to delete this enrollment" +msgstr "" + msgid "Delete enrollment" msgstr "Hapus pendaftaran" @@ -1269,6 +1291,9 @@ msgstr "Peringatan" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Hapus even" @@ -1287,9 +1312,6 @@ msgstr "Even selesai" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1482,10 +1504,18 @@ msgstr "" msgid "Stages and Events" msgstr "Tahapan dan Even" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1521,6 +1551,12 @@ msgstr "" msgid "Value" msgstr "Nilai" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1581,6 +1617,46 @@ msgstr "Unduh data..." msgid "an error occurred loading working lists" msgstr "terjadi kesalahan saat memuat daftar kerja" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "tanggal registrasi" @@ -1596,13 +1672,112 @@ msgstr "Tindak lanjut" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1614,6 +1789,13 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "Perbarui tampilan" diff --git a/i18n/km.po b/i18n/km.po index f203f663af..4b9fd27291 100644 --- a/i18n/km.po +++ b/i18n/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Khmer (https://app.transifex.com/hisp-uio/teams/100509/km/)\n" @@ -38,6 +38,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "ព្រឹត្តិការណ៏ថ្មី" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "ស្វែងរក" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -290,9 +323,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "ព្រឹត្តិការណ៏ថ្មី" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -505,9 +535,6 @@ msgstr "វាយបញ្ចូលមុខងារដើម្បីច្រ msgid "No match found" msgstr "" -msgid "Search" -msgstr "ស្វែងរក" - msgid "Clear" msgstr "លុបចោល" @@ -665,7 +692,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -840,9 +869,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -878,15 +904,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "ផ្ទាំងចម្រោះ​សង្ខេបព័ត៌មាន" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "" @@ -912,6 +929,9 @@ msgstr "Loading" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1050,7 +1070,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1059,7 +1079,7 @@ msgstr "កែសម្រួល​" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1233,6 +1253,9 @@ msgstr "" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "លុបចោលព្រឹត្តិការណ៏" @@ -1251,9 +1274,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1446,10 +1466,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1485,6 +1513,12 @@ msgstr "" msgid "Value" msgstr "តម្លៃ" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1545,6 +1579,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1560,13 +1634,112 @@ msgstr "តាមដាន" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1578,6 +1751,13 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "" diff --git a/i18n/lo.po b/i18n/lo.po index 3137abc4f2..f440a37d41 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -1,7 +1,6 @@ # # Translators: # Philip Larsen Donnelly, 2022 -# Somkhit Bouavong , 2024 # Thuy Nguyen , 2024 # Viktor Varland , 2024 # Namwan Chanthavisouk, 2024 @@ -10,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Saysamone Sibounma, 2024\n" "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n" @@ -47,6 +46,39 @@ msgstr "" "ກະ​ລຸ​ນາ​ໂຫຼດ​ຫນ້າ​ນີ້​ຄືນ​ໃຫມ່​ຖ້າ​ຫາກ​ວ່າ​ທ່ານ​ຕ້ອງ​ການ​ທີ່​ຈະ​ນໍາ​ໃຊ້​ເວີຊັນນີ້​ອີກ​ເທື່ອ​ຫນຶ່ງ​," " ແຕ່​ລະວັງໄວ້ວ່າມັນຈະ​ປິດ​ເວີຊັນ​ອື່ນ​." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "ແກ້ໄຂເຫດການ" + +msgid "New event" +msgstr "ກໍລະນີໃໝ່" + +msgid "Active enrollments" +msgstr "ການລົງທະບຽນທີ່ຍັງເຄື່ອນໄຫວ" + +msgid "Completed enrollments" +msgstr "ສໍາເລັດການລົງທະບຽນ" + +msgid "Cancelled enrollments" +msgstr "ຍົກເລີກການລົງທະບຽນ" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "ຄົນຫາ" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "ເພີ່ມເຕີມ" @@ -301,9 +333,6 @@ msgstr "ຕົກລົງ, ຍົກເລີກການປ່ຽນແປງ" msgid "No, cancel" msgstr "ບໍ່, ຍົກເລີກ" -msgid "New event" -msgstr "ກໍລະນີໃໝ່" - msgid "You don't have access to create an event in the current selections" msgstr "ທ່ານບໍ່ໄດ້ອະນຸຍາດໃຫ້ສ້າງເຫດການໃນຕົວເລືອກນີ້" @@ -521,9 +550,6 @@ msgstr "ປະເພດຕົວເລືອກການກອງ" msgid "No match found" msgstr "ບໍ່ພົບຂໍ້ມູນທີ່ກົງກັນ" -msgid "Search" -msgstr "ຄົນຫາ" - msgid "Clear" msgstr "ລຶບ" @@ -865,9 +891,6 @@ msgstr "ເຫດການ" msgid "You don't have access to edit this event" msgstr "ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃນການແກ້ໄຂເຫດການນີ້" -msgid "Edit event" -msgstr "ແກ້ໄຂເຫດການ" - msgid "View changelog" msgstr "ເບິ່ງບັນທຶກການປ່ຽນແປງ" @@ -903,15 +926,6 @@ msgstr "ບໍ່ສາມາດໂຫຼດເຫດການໄດ້" msgid "Organisation unit could not be loaded" msgstr "ບໍ່ສາມາດໂຫຼດຫົວໜ່ວຍການຈັດຕັ້ງໄດ້" -msgid "Dashboard" -msgstr "ກະດານຂ່າວ" - -msgid "Edit Event" -msgstr "ແກ້ໄຂເຫດການ" - -msgid "View Event" -msgstr "ເບິ່ງເຫດການ" - msgid "Selected program" msgstr "ເລືອກສາຍງານ" @@ -937,6 +951,9 @@ msgstr "ກໍາລັງໂຫຼດ" msgid "An error occurred while loading the form" msgstr "ພົບບັນຫາໃນລະຫວ່າງການໂຫຼດຟອມ" +msgid "Back to all stages and events" +msgstr "ກັບໄປທຸກຂັ້ນຕອນ ແລະ ເຫດການ" + msgid "Possible duplicates found" msgstr "ພົບການຊໍ້າກັນທີ່ເປັນໄປໄດ້" @@ -1268,6 +1285,9 @@ msgstr "ແຈ້ງເຕືອນ" msgid "stage not found in rules execution" msgstr "ບໍ່ພົບຂັ້ນຕອນໃນການປະຕິບັດກົດລະບຽບ" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "ລືບກໍລະນີອອກ" @@ -1286,9 +1306,6 @@ msgstr "ກິດຈະກຳສຳເລັດແລ້ວ" msgid "The event cannot be edited after it has been completed" msgstr "ເຫດການດັ່ງກ່າວບໍ່ສາມາດແກ້ໄຂໄດ້ຫຼັງຈາກສໍາເລັດແລ້ວ" -msgid "Back to all stages and events" -msgstr "ກັບໄປທຸກຂັ້ນຕອນ ແລະ ເຫດການ" - msgid "Notes about this event" msgstr "ຂໍ້ຄວາມກ່ຽວກັບເຫດການນີ້" @@ -1490,11 +1507,19 @@ msgstr "{{ scheduledEvents }} ກຳນົດເວລາ" msgid "Stages and Events" msgstr "ຂັ້ນຕອນ ແລະ ເຫດການ" +msgid "View linked event" +msgstr "ເບິ່ງເຫດການທີ່ເຊື່ອມໂຍງ" + msgid "An error occurred while loading the widget." msgstr "ເກີດຄວາມຜິດພາດຂຶ້ນໃນຂະນະທີ່ໂຫຼດລາຍການ." -msgid "View linked event" -msgstr "ເບິ່ງເຫດການທີ່ເຊື່ອມໂຍງ" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" +msgstr "" msgid "Scheduled" msgstr "ຕາມເວລາທີ່ກໍານົດ" @@ -1529,6 +1554,12 @@ msgstr "ປ່ຽນ" msgid "Value" msgstr "ຄ່າ" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "ຄວາມສໍາພັນໃໝ່ {{trackedEntityTypeName}} " @@ -1591,6 +1622,46 @@ msgstr "ໂຫຼດຂໍ້ມູນ..." msgid "an error occurred loading working lists" msgstr "ເກີດຄວາມຜິດພາດໃນການໂຫຼດລາຍການ" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "ວັນທີລົງທະບຽນ" @@ -1606,14 +1677,113 @@ msgstr "ຕິດຕາມ" msgid "Choose a program stage to filter by {{label}}" msgstr "ເລືອກຂັ້ນຕອນໂປແກຼມເພື່ອກັ່ນຕອງໂດຍ {{label}}" -msgid "Active enrollments" -msgstr "ການລົງທະບຽນທີ່ຍັງເຄື່ອນໄຫວ" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "ສໍາເລັດການລົງທະບຽນ" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "ຍົກເລີກການລົງທະບຽນ" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "ລາຍຊື່ເຮັດວຽກບໍ່ສາມາດອັບເດດໄດ້" @@ -1624,6 +1794,13 @@ msgstr "ເກີດຄວາມຜິດພາດໃນການໂຫຼດລ msgid "an error occurred loading Tracked entity instance lists" msgstr "ເກີດຄວາມຜິດພາດໃນການໂຫຼດລາຍການຕົວຢ່າງການຕິດຕາມລາຍບຸກຄົນ" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "ອັບເດດມຸມມອງ" diff --git a/i18n/my.po b/i18n/my.po index e86c5d5eca..3e9b625838 100644 --- a/i18n/my.po +++ b/i18n/my.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Burmese (https://app.transifex.com/hisp-uio/teams/100509/my/)\n" @@ -39,6 +39,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -291,9 +324,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -506,9 +536,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "" - msgid "Clear" msgstr "ရှင်းလင်းသည်" @@ -666,7 +693,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -841,9 +870,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -879,15 +905,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "အချက်အလက်များလေ့လာဆန်းစစ်ခြင်း" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "" @@ -913,6 +930,9 @@ msgstr "Loading, please wait" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1051,7 +1071,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1060,7 +1080,7 @@ msgstr "တည်းဖြတ်သည်" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1234,6 +1254,9 @@ msgstr "သတိ" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1252,9 +1275,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1447,10 +1467,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1486,6 +1514,12 @@ msgstr "" msgid "Value" msgstr "တန်ဖိုး" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1546,6 +1580,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "စာရင်းသွင်းသော နေ့စွဲ" @@ -1561,13 +1635,112 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1579,6 +1752,13 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "" diff --git a/i18n/nb.po b/i18n/nb.po index 97ce9b28c4..67e58811e9 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -1,15 +1,15 @@ # # Translators: -# Karoline Tufte Lien , 2024 # Merethe Wollan Blisten, 2024 # Caroline Hesthagen Holen , 2024 +# Karoline Tufte Lien , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Caroline Hesthagen Holen , 2024\n" +"Last-Translator: Karoline Tufte Lien , 2024\n" "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,6 +44,39 @@ msgstr "" "denne siden hvis du vil bruke denne versjonen igjen, men vær oppmerksom på " "at dette vil lukke andre versjoner." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Rediger hendelse" + +msgid "New event" +msgstr "Ny hendelse" + +msgid "Active enrollments" +msgstr "Aktive registreringer" + +msgid "Completed enrollments" +msgstr "Fullførte registreringer" + +msgid "Cancelled enrollments" +msgstr "Avbrutte registreringer" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Søk" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Mer" @@ -301,9 +334,6 @@ msgstr "Ja, forkast endringer" msgid "No, cancel" msgstr "Nei, avbryt" -msgid "New event" -msgstr "Ny hendelse" - msgid "You don't have access to create an event in the current selections" msgstr "Du har ikke tilgang til å lage en hendelse i gjeldende valg" @@ -524,9 +554,6 @@ msgstr "Skriv for å filtrere alternativer" msgid "No match found" msgstr "Ingen treff funnet" -msgid "Search" -msgstr "Søk" - msgid "Clear" msgstr "Fjern" @@ -872,9 +899,6 @@ msgstr "hendelse" msgid "You don't have access to edit this event" msgstr "Du har ikke tilgang til å redigere denne hendelsen" -msgid "Edit event" -msgstr "Rediger hendelse" - msgid "View changelog" msgstr "Vis endringslogg" @@ -912,15 +936,6 @@ msgstr "Hendelse kunne ikke lastes inn" msgid "Organisation unit could not be loaded" msgstr "Organisasjonsenhet kunne ikke lastes inn" -msgid "Dashboard" -msgstr "Dashbord" - -msgid "Edit Event" -msgstr "Endre hendelse" - -msgid "View Event" -msgstr "Se hendelse" - msgid "Selected program" msgstr "Valgt program" @@ -947,6 +962,9 @@ msgstr "Laster" msgid "An error occurred while loading the form" msgstr "Det oppsto en feil ved åpning av skjemaet" +msgid "Back to all stages and events" +msgstr "Tilbake til alle faser og hendelser" + msgid "Possible duplicates found" msgstr "Mulige duplikater funnet" @@ -1291,6 +1309,9 @@ msgstr "Advarsel" msgid "stage not found in rules execution" msgstr "fase ikke funnet i regelutførelse" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Slett hendelse" @@ -1309,9 +1330,6 @@ msgstr "Hendelse fullført" msgid "The event cannot be edited after it has been completed" msgstr "Hendelsen kan ikke redigeres etter at den er fullført" -msgid "Back to all stages and events" -msgstr "Tilbake til alle faser og hendelser" - msgid "Notes about this event" msgstr "Notater om denne hendelsen" @@ -1522,11 +1540,19 @@ msgstr "{{ scheduledEvents }} planlagt" msgid "Stages and Events" msgstr "Faser og hendelser" +msgid "View linked event" +msgstr "Vis knyttede hendelser" + msgid "An error occurred while loading the widget." msgstr "En feil oppstå ved lasting av widget. " -msgid "View linked event" -msgstr "Vis knyttede hendelser" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" +msgstr "" msgid "Scheduled" msgstr "Planlagt" @@ -1561,6 +1587,12 @@ msgstr "Endre" msgid "Value" msgstr "Verdi" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Ny {{trackedEntityTypeName}} relasjon" @@ -1623,6 +1655,46 @@ msgstr "Last ned data..." msgid "an error occurred loading working lists" msgstr "en feil oppstod ved lasting av arbeidslister" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Innregistreringsdato" @@ -1638,14 +1710,121 @@ msgstr "Oppfølging" msgid "Choose a program stage to filter by {{label}}" msgstr "Velg en programfase å filtrere etter {{label}}" -msgid "Active enrollments" -msgstr "Aktive registreringer" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "Fullførte registreringer" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "Avbrutte registreringer" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "Arbeidslisten kunne ikke oppdateres" @@ -1656,6 +1835,14 @@ msgstr "det oppstod en feil ved lasting av arbeidslistene" msgid "an error occurred loading Tracked entity instance lists" msgstr "det oppstod en feil ved lasting av lister over sporede enheter" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "{{count}} valgt" +msgstr[1] "{{count}} valgt" + +msgid "Deselect all" +msgstr "Fjern valg" + msgid "Update view" msgstr "Oppdater visning" diff --git a/i18n/nl.po b/i18n/nl.po index 6a73105036..40fd2fa3e0 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -3,15 +3,16 @@ # Cherise Beek , 2021 # Yury Rogachev , 2021 # Philip Larsen Donnelly, 2024 -# Charel van den Elsen, 2024 # Rica, 2024 +# Enzo Nicolas Rossi , 2024 +# Charel van den Elsen, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Rica, 2024\n" +"Last-Translator: Charel van den Elsen, 2024\n" "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,6 +48,39 @@ msgstr "" "gebruiken, maar houd er rekening mee dat hierdoor andere versies worden " "gesloten." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Evenement bewerken" + +msgid "New event" +msgstr "Nieuw evenement" + +msgid "Active enrollments" +msgstr "Actieve inschrijvingen" + +msgid "Completed enrollments" +msgstr "Voltooide inschrijvingen" + +msgid "Cancelled enrollments" +msgstr "Geannuleerde inschrijvingen" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Zoek" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Meer" @@ -306,9 +340,6 @@ msgstr "Ja, wijzigingen negeren" msgid "No, cancel" msgstr "Nee, annuleer" -msgid "New event" -msgstr "Nieuw evenement" - msgid "You don't have access to create an event in the current selections" msgstr "" "Je hebt geen toegang om een evenement te maken in de huidige selecties" @@ -530,9 +561,6 @@ msgstr "Typ om opties te filteren" msgid "No match found" msgstr "" -msgid "Search" -msgstr "Zoek" - msgid "Clear" msgstr "Duidelijk" @@ -881,9 +909,6 @@ msgstr "evenement" msgid "You don't have access to edit this event" msgstr "Je hebt geen toegangsrechten om dit evenement te bewerken" -msgid "Edit event" -msgstr "Evenement bewerken" - msgid "View changelog" msgstr "" @@ -921,15 +946,6 @@ msgstr "Evenement kan niet worden geladen" msgid "Organisation unit could not be loaded" msgstr "Organisatie-eenheid kan niet worden geladen" -msgid "Dashboard" -msgstr "Dashboard" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Geselecteerd programma" @@ -957,6 +973,9 @@ msgstr "" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "Terug naar alle stadium en evenementen" + msgid "Possible duplicates found" msgstr "Mogelijke duplicaten gevonden" @@ -1298,6 +1317,9 @@ msgstr "Waarschuwing" msgid "stage not found in rules execution" msgstr "stadium niet gevonden in uitvoering van regels" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "evenement verwijderen" @@ -1317,9 +1339,6 @@ msgstr "Evenement voltooid" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "Terug naar alle stadium en evenementen" - msgid "Notes about this event" msgstr "" @@ -1529,10 +1548,18 @@ msgstr "{{ scheduledEvents }} gepland" msgid "Stages and Events" msgstr "stadiums en evenementen" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1568,6 +1595,12 @@ msgstr "" msgid "Value" msgstr "Waarde" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1628,6 +1661,46 @@ msgstr "Gegevens downloaden..." msgid "an error occurred loading working lists" msgstr "er is een fout opgetreden bij het laden van werklijsten" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "registratie datum" @@ -1643,14 +1716,121 @@ msgstr "Volg op" msgid "Choose a program stage to filter by {{label}}" msgstr "Kies een programmafase om op te filteren {{label}}" -msgid "Active enrollments" -msgstr "Actieve inschrijvingen" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "Voltooide inschrijvingen" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "Geannuleerde inschrijvingen" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "Werklijst kon niet worden bijgewerkt" @@ -1663,6 +1843,14 @@ msgstr "" "er is een fout opgetreden bij het laden van lijsten met instanties van " "bijgehouden entiteiten" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "{{count}} geselecteerd" +msgstr[1] "{{count}} geselecteerd" + +msgid "Deselect all" +msgstr "Deselecteer alles" + msgid "Update view" msgstr "Weergave bijwerken" diff --git a/i18n/prs.po b/i18n/prs.po index 76198d8d85..c851e741bf 100644 --- a/i18n/prs.po +++ b/i18n/prs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Persian (Afghanistan) (https://app.transifex.com/hisp-uio/teams/100509/fa_AF/)\n" @@ -36,6 +36,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "رویداد جدید" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "جستجو" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "بیشتر" @@ -288,9 +321,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "رویداد جدید" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -504,9 +534,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "جستجو" - msgid "Clear" msgstr "پاک کردن" @@ -664,7 +691,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -839,9 +868,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -877,15 +903,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "داشبورد" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "برنامه های انتخاب شده" @@ -912,6 +929,9 @@ msgstr "در حال بار کردن" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1050,7 +1070,7 @@ msgstr "" msgid "Assigned to" msgstr "تعین شده" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1059,7 +1079,7 @@ msgstr "تجدید" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1233,6 +1253,9 @@ msgstr "هشدار\\:" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1251,9 +1274,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1449,10 +1469,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1488,6 +1516,12 @@ msgstr "" msgid "Value" msgstr "مقدار" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1548,6 +1582,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "تاریخ ثبت و راجستر" @@ -1563,13 +1637,120 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1581,6 +1762,14 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "" diff --git a/i18n/ps.po b/i18n/ps.po index f8acba0571..b851b0cd44 100644 --- a/i18n/ps.po +++ b/i18n/ps.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Pashto (https://app.transifex.com/hisp-uio/teams/100509/ps/)\n" @@ -37,6 +37,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "نوې پېښه" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "جستجو" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "نور" @@ -289,9 +322,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "نوې پېښه" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -505,9 +535,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "جستجو" - msgid "Clear" msgstr "پاک یې کړئ" @@ -665,7 +692,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -840,9 +869,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -878,15 +904,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "ډېشبورډ [ ډېسبورډ ]" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "انتخاب شوی پروګرام" @@ -913,6 +930,9 @@ msgstr "د پورته کېدو یا لوډینګ په حال کې" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1051,7 +1071,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1060,7 +1080,7 @@ msgstr "درست یې کړئ" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1234,6 +1254,9 @@ msgstr "خبرداری" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1252,9 +1275,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1450,10 +1470,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1489,6 +1517,12 @@ msgstr "" msgid "Value" msgstr "ارزښت یا رقم" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1549,6 +1583,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "د راجسټرېشن نېټه" @@ -1564,13 +1638,120 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1582,6 +1763,14 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "" diff --git a/i18n/pt.po b/i18n/pt.po index 7261e12ecb..fe07019b65 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -3,22 +3,23 @@ # David Júnior , 2021 # Fernando Jorge Bade, 2023 # Philip Larsen Donnelly, 2024 -# Gabriela Rodriguez , 2024 # Ge Joao , 2024 # Viktor Varland , 2024 # Juan M Alcantara Acosta , 2024 # Sheila André , 2024 # Jason Pickering , 2024 +# Laurência Luís, 2024 +# David Mondlane, 2024 # Helton Dias, 2024 +# Gabriela Rodriguez , 2024 # Shelsea Chumaio, 2024 -# Laurência Luís, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Laurência Luís, 2024\n" +"Last-Translator: Shelsea Chumaio, 2024\n" "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,6 +54,39 @@ msgstr "" "(no mesmo domínio). Actualize esta página se desejar usar esta versão " "novamente, mas esteja ciente de que isso fechará outras versões." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Editar evento" + +msgid "New event" +msgstr "Novo evento" + +msgid "Active enrollments" +msgstr "Inscrições ativas" + +msgid "Completed enrollments" +msgstr "Inscrições concluídas" + +msgid "Cancelled enrollments" +msgstr "Inscrições canceladas" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Pesquisar" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Mais" @@ -311,9 +345,6 @@ msgstr "Sim, descartar alterações" msgid "No, cancel" msgstr "Não cancele" -msgid "New event" -msgstr "Novo evento" - msgid "You don't have access to create an event in the current selections" msgstr "Você não tem acesso para criar um evento nas seleções atuais" @@ -537,9 +568,6 @@ msgstr "Tipo de opções de filtros" msgid "No match found" msgstr "Nenhuma correspondência encontrada" -msgid "Search" -msgstr "Pesquisar" - msgid "Clear" msgstr "Limpar" @@ -707,8 +735,8 @@ msgid "" "You do not have permissions to access to this program, registering unit or " "record, contact your administrator for more information." msgstr "" -"Não tem permissões para aceder a este programa, unidade de registo, contacte" -" o seu administrador para mais informações." +"Não tem permissões para aceder a este programa, e efectuar algum registo, " +"contacte o seu administrador para mais informações." msgid "{{teiDisplayName}} is not enrolled in this program." msgstr "{{teiDisplayName}} não está inscrito neste programa." @@ -804,7 +832,7 @@ msgid "" "You don't have access to create a {{trackedEntityName}} in the current " "selections" msgstr "" -"Não tem acesso para criar um {{trackedEntityName}} nas selecções actuais" +"Com base na selecções, não tem acesso para criar um {{trackedEntityName}} " msgid "Choose the {{missingCategories}} to start reporting" msgstr "Escolha as {{missingCategories}} para começar a relatar" @@ -828,7 +856,7 @@ msgid "New Enrollment in program{{escape}} {{programName}}" msgstr "Nova Inscrição no programa{{escape}} {{programName}}" msgid "Save {{trackedEntityTypeName}}" -msgstr "Guardar {{trackedEntityTypeName}}" +msgstr "Salvar {{trackedEntityTypeName}}" msgid "Save {{trackedEntityName}}" msgstr "Gravar {{trackedEntityName}}" @@ -890,9 +918,6 @@ msgstr "evento" msgid "You don't have access to edit this event" msgstr "Não tem acesso para editar este evento" -msgid "Edit event" -msgstr "Editar evento" - msgid "View changelog" msgstr "Ver registo de alterações" @@ -930,15 +955,6 @@ msgstr "O evento não pôde ser carregado" msgid "Organisation unit could not be loaded" msgstr "Não foi possível carregar a unidade organizacional" -msgid "Dashboard" -msgstr "Painel de Instrumentos" - -msgid "Edit Event" -msgstr "Editar evento" - -msgid "View Event" -msgstr "Ver evento" - msgid "Selected program" msgstr "Programa selecionado" @@ -956,18 +972,21 @@ msgstr[2] "Preencha pelo menos {{count}} atributos para pesquisar" msgid "Could not retrieve metadata. Please try again later." msgstr "" -"Não foi possível recuperar os metadados. Por favor, tente novamente mais " +"Não foi possível extrair os metadados. Por favor, tente novamente mais " "tarde." msgid "The enrollment event data could not be found" msgstr "Os dados do evento de inscrição não foram encontrados" msgid "Loading" -msgstr "Carregando.." +msgstr "A carregar.." msgid "An error occurred while loading the form" msgstr "Ocorreu um erro ao carregar o formulário" +msgid "Back to all stages and events" +msgstr "Voltar para todos os palcos e eventos" + msgid "Possible duplicates found" msgstr "Possíveis duplicatas encontradas" @@ -1027,7 +1046,7 @@ msgid "Search {{name}}" msgstr "Pesquise {{name}}" msgid "Search by {{name}}" -msgstr "Procura por {{name}}" +msgstr "Pesquise por {{name}}" msgid "all programs" msgstr "todos os programas" @@ -1105,7 +1124,7 @@ msgid "Create saved list" msgstr "Criar lista gravadas" msgid "Create new in another program" -msgstr "Criar novo noutro programa" +msgstr "Criar novo em outro programa" msgid "Create new event" msgstr "Criar um novo evento" @@ -1320,6 +1339,9 @@ msgstr "Aviso" msgid "stage not found in rules execution" msgstr "estágio não encontrado na execução das regras" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Apagar evento" @@ -1338,9 +1360,6 @@ msgstr "Evento concluído" msgid "The event cannot be edited after it has been completed" msgstr "O evento não pode ser editado depois de ter sido concluído" -msgid "Back to all stages and events" -msgstr "Voltar para todos os palcos e eventos" - msgid "Notes about this event" msgstr "Notas sobre este evento" @@ -1557,11 +1576,19 @@ msgstr "{{ scheduledEvents }} agendado" msgid "Stages and Events" msgstr "Fases e Eventos" +msgid "View linked event" +msgstr "Ver evento associado" + msgid "An error occurred while loading the widget." msgstr "Ocorreu um erro ao carregar o widget." -msgid "View linked event" -msgstr "Ver evento associado" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" +msgstr "" msgid "Scheduled" msgstr "Agendado" @@ -1596,6 +1623,12 @@ msgstr "Alterar" msgid "Value" msgstr "Valor" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Relacionamento {{trackedEntityTypeName}} " @@ -1661,6 +1694,46 @@ msgstr "Baixar dados ..." msgid "an error occurred loading working lists" msgstr "ocorreu um erro ao carregar as listas de trabalho" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr " Ocorreu um erro desconhecido." + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Data de registro" @@ -1676,14 +1749,129 @@ msgstr "Acompanhamento" msgid "Choose a program stage to filter by {{label}}" msgstr "Escolha uma etapa do programa para filtrar por {{label}}" -msgid "Active enrollments" -msgstr "Inscrições ativas" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "Inscrições concluídas" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "Inscrições canceladas" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "A lista de trabalho não pôde ser atualizada" @@ -1695,6 +1883,15 @@ msgid "an error occurred loading Tracked entity instance lists" msgstr "" "ocorreu um erro ao carregar as listas de instâncias de entidades rastreadas" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "{{count}} selecionado" +msgstr[1] "{{count}} selecionado" +msgstr[2] "{{count}} seleccionado" + +msgid "Deselect all" +msgstr "Desmarcar todos" + msgid "Update view" msgstr "Vista de atualização" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po index dde9b5e1e0..f258d5f2dd 100644 --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -1,14 +1,14 @@ # # Translators: # Oscar Mesones Lapouble , 2021 -# Viktor Varland , 2024 # Thiago Rocha, 2024 +# Viktor Varland , 2024 # Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/hisp-uio/teams/100509/pt_BR/)\n" @@ -39,6 +39,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "Novo evento" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Pesquisar" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Mais" @@ -291,9 +324,6 @@ msgstr "" msgid "No, cancel" msgstr "Não, cancelar" -msgid "New event" -msgstr "Novo evento" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -508,9 +538,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "Pesquisar" - msgid "Clear" msgstr "Limpar" @@ -668,7 +695,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -843,9 +872,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -881,15 +907,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "Gráficos" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Programa selecionado" @@ -917,6 +934,9 @@ msgstr "Carregando.." msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1055,7 +1075,7 @@ msgstr "" msgid "Assigned to" msgstr "Atribuido a" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1064,7 +1084,7 @@ msgstr "Editar" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1238,6 +1258,9 @@ msgstr "Advertência" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1256,9 +1279,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1457,10 +1477,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1496,6 +1524,12 @@ msgstr "" msgid "Value" msgstr "Valor" +msgid "File" +msgstr "Arquivo" + +msgid "Image" +msgstr "Imagem (PNG)" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1556,6 +1590,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Data do Registo" @@ -1571,13 +1645,128 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1589,6 +1778,15 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "Deselect all" +msgstr "Desmarcar todos" + msgid "Update view" msgstr "" diff --git a/i18n/ru.po b/i18n/ru.po index 0d16b78d76..d1f57202d8 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Russian (https://app.transifex.com/hisp-uio/teams/100509/ru/)\n" @@ -46,6 +46,39 @@ msgstr "" "версии в том же самом домене. Обновите эту страницу, если вы хотите " "использовать эту версию, но имейте в виду, что другие версии будут закрыты." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Редактировать событие" + +msgid "New event" +msgstr "Новое событие" + +msgid "Active enrollments" +msgstr "Активные регистрационные записи" + +msgid "Completed enrollments" +msgstr "Завершенные регистрационные записи" + +msgid "Cancelled enrollments" +msgstr "Отмененные регистрационные записи" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Поиск" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Более" @@ -304,9 +337,6 @@ msgstr "Да, не сохранять изменения" msgid "No, cancel" msgstr "Нет, отменить" -msgid "New event" -msgstr "Новое событие" - msgid "You don't have access to create an event in the current selections" msgstr "Не достаточно прав для создания события с текущим выбором" @@ -530,9 +560,6 @@ msgstr "Начать печатать для фильтрации опций" msgid "No match found" msgstr "Совпадения не найдены" -msgid "Search" -msgstr "Поиск" - msgid "Clear" msgstr "Очистить" @@ -883,9 +910,6 @@ msgstr "событие" msgid "You don't have access to edit this event" msgstr "У вас нет доступа к редактированию этого события" -msgid "Edit event" -msgstr "Редактировать событие" - msgid "View changelog" msgstr "Посмотреть лог изменений" @@ -922,15 +946,6 @@ msgstr "Событие не удалось загрузить" msgid "Organisation unit could not be loaded" msgstr "Организационную единицу не удалось загрузить" -msgid "Dashboard" -msgstr "Информационная панель" - -msgid "Edit Event" -msgstr "Редактировать событие" - -msgid "View Event" -msgstr "Посмотреть событие" - msgid "Selected program" msgstr "Выбранная программа" @@ -959,6 +974,9 @@ msgstr "Загрузка" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "Обратно ко всем этапам и событиям" + msgid "Possible duplicates found" msgstr "Найдены возможные дубликаты " @@ -1312,6 +1330,9 @@ msgstr "Предупреждение" msgid "stage not found in rules execution" msgstr "этап не найден при выполнении правил" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Удалить событие" @@ -1332,9 +1353,6 @@ msgstr "Событие завершено" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "Обратно ко всем этапам и событиям" - msgid "Notes about this event" msgstr "" @@ -1560,10 +1578,18 @@ msgstr " Событий запланировано: {{ scheduledEvents }}" msgid "Stages and Events" msgstr "Этапы и события" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1599,6 +1625,12 @@ msgstr "Изменить" msgid "Value" msgstr "Значение" +msgid "File" +msgstr "Файл" + +msgid "Image" +msgstr "Изображение" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "Новая связь для объекта {{trackedEntityTypeName}} " @@ -1661,6 +1693,46 @@ msgstr "Загрузка данных..." msgid "an error occurred loading working lists" msgstr "произошла ошибка во время загрузки рабочих списков" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Дата регистрации" @@ -1676,14 +1748,137 @@ msgstr "Отслеживать" msgid "Choose a program stage to filter by {{label}}" msgstr "Выберите этап программы для фильтрации по {{label}}" -msgid "Active enrollments" -msgstr "Активные регистрационные записи" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "Завершенные регистрационные записи" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "Отмененные регистрационные записи" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "Не удалось обновить рабочий список" @@ -1694,6 +1889,16 @@ msgstr "произошла ошибка при загрузке рабочих msgid "an error occurred loading Tracked entity instance lists" msgstr "произошла ошибка при загрузке списков отслеживаемых объектов" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "{{count}} выбран" +msgstr[1] "{{count}} выбрано" +msgstr[2] "{{count}} выбрано" +msgstr[3] "{{count}} выбрано" + +msgid "Deselect all" +msgstr "Отменить выбор всего" + msgid "Update view" msgstr "Обновить список" diff --git a/i18n/sv.po b/i18n/sv.po index 6e16f66d26..1c3904c285 100644 --- a/i18n/sv.po +++ b/i18n/sv.po @@ -1,16 +1,16 @@ # # Translators: -# Jason Pickering , 2023 -# Philip Larsen Donnelly, 2024 # Martin , 2024 # Viktor Varland , 2024 +# Jason Pickering , 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Swedish (https://app.transifex.com/hisp-uio/teams/100509/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,6 +39,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "Ny händelse" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Sök" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -291,9 +324,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "Ny händelse" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -507,9 +537,6 @@ msgstr "" msgid "No match found" msgstr "ingen matchning hittad" -msgid "Search" -msgstr "Sök" - msgid "Clear" msgstr "Klar" @@ -667,7 +694,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -842,9 +871,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -880,15 +906,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "instrumentbräda" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "" @@ -915,6 +932,9 @@ msgstr "" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1053,7 +1073,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1062,7 +1082,7 @@ msgstr "Redigera" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1236,6 +1256,9 @@ msgstr "Varning" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Ta bort händelse" @@ -1254,9 +1277,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1452,10 +1472,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1491,6 +1519,12 @@ msgstr "" msgid "Value" msgstr "Värde" +msgid "File" +msgstr "File" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1551,6 +1585,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1566,13 +1640,120 @@ msgstr "Följ upp" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1584,6 +1765,14 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "{{count}} vald" +msgstr[1] "{{count}} valda" + +msgid "Deselect all" +msgstr "Avmarkera alla" + msgid "Update view" msgstr "" diff --git a/i18n/tet.po b/i18n/tet.po index 4757d41fce..1f635ad1d9 100644 --- a/i18n/tet.po +++ b/i18n/tet.po @@ -1,14 +1,14 @@ # # Translators: -# Viktor Varland , 2019 # Philip Larsen Donnelly, 2024 +# Viktor Varland , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Viktor Varland , 2024\n" "Language-Team: Tetum (Tetun) (https://app.transifex.com/hisp-uio/teams/100509/tet/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,6 +37,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -289,9 +322,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -504,9 +534,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "" - msgid "Clear" msgstr "Hamós" @@ -664,7 +691,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -839,9 +868,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -877,15 +903,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "Painel Kontrolu" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "" @@ -911,6 +928,9 @@ msgstr "" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1049,7 +1069,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1058,7 +1078,7 @@ msgstr "Edita" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1232,6 +1252,9 @@ msgstr "Avizu" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1250,9 +1273,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1445,10 +1465,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1484,6 +1512,12 @@ msgstr "" msgid "Value" msgstr "Valor" +msgid "File" +msgstr "" + +msgid "Image" +msgstr "Imajen" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1544,6 +1578,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1559,13 +1633,112 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1577,6 +1750,13 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "" diff --git a/i18n/tg.po b/i18n/tg.po index 545222c3dc..d3a40c50ab 100644 --- a/i18n/tg.po +++ b/i18n/tg.po @@ -1,14 +1,14 @@ # # Translators: -# Viktor Varland , 2024 # Philip Larsen Donnelly, 2024 +# Viktor Varland , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Viktor Varland , 2024\n" "Language-Team: Tajik (https://app.transifex.com/hisp-uio/teams/100509/tg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,6 +37,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Ҷустуҷӯ" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "" @@ -289,9 +322,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -505,9 +535,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "Ҷустуҷӯ" - msgid "Clear" msgstr "Пок кардан" @@ -665,7 +692,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -840,9 +869,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -878,15 +904,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "Лавҳаи маълумот" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "" @@ -913,6 +930,9 @@ msgstr "Бор мешавад" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1051,7 +1071,7 @@ msgstr "" msgid "Assigned to" msgstr "таъиншуда ба" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1060,7 +1080,7 @@ msgstr "Таҳрир" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1234,6 +1254,9 @@ msgstr "Огоҳӣ" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1252,9 +1275,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1450,10 +1470,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1489,6 +1517,12 @@ msgstr "" msgid "Value" msgstr "Қимат" +msgid "File" +msgstr "Файл" + +msgid "Image" +msgstr "Тасвир" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1549,6 +1583,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Санаи бақайдгирӣ" @@ -1564,13 +1638,120 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1582,6 +1763,14 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" + +msgid "Deselect all" +msgstr "" + msgid "Update view" msgstr "" diff --git a/i18n/uk.po b/i18n/uk.po index 0506bb74f1..c5c3548f13 100644 --- a/i18n/uk.po +++ b/i18n/uk.po @@ -1,15 +1,15 @@ # # Translators: # Wanda , 2024 -# Éva Tamási, 2024 -# Nadiia , 2024 # Viktor Varland , 2024 +# Nadiia , 2024 +# Éva Tamási, 2024 # Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Ukrainian (https://app.transifex.com/hisp-uio/teams/100509/uk/)\n" @@ -40,6 +40,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "Нова подія" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Пошук" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Більше" @@ -292,9 +325,6 @@ msgstr "Так, скасувати зміни" msgid "No, cancel" msgstr "Ні, скасувати" -msgid "New event" -msgstr "Нова подія" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -510,9 +540,6 @@ msgstr "Введіть параметри фільтра" msgid "No match found" msgstr "" -msgid "Search" -msgstr "Пошук" - msgid "Clear" msgstr "Очистити" @@ -670,7 +697,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -845,9 +874,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -883,15 +909,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "Інформаційна панель (дашборд)" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Обрані програми" @@ -920,6 +937,9 @@ msgstr "Завантаження" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1058,7 +1078,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1067,7 +1087,7 @@ msgstr "Редагувати" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1241,6 +1261,9 @@ msgstr "Попередження" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Видалити подію" @@ -1259,9 +1282,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1463,10 +1483,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1502,6 +1530,12 @@ msgstr "" msgid "Value" msgstr "Значення" +msgid "File" +msgstr "Файл" + +msgid "Image" +msgstr "" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1562,6 +1596,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1577,13 +1651,136 @@ msgstr "Подальші дії" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1595,6 +1792,16 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "Вибрано {{count}}" +msgstr[1] "Вибрано {{count}}" +msgstr[2] "Вибрано {{count}}" +msgstr[3] "Вибрано {{count}}" + +msgid "Deselect all" +msgstr "Скасувати вибір усіх" + msgid "Update view" msgstr "" diff --git a/i18n/ur.po b/i18n/ur.po index a955c4e3e1..7b7984762f 100644 --- a/i18n/ur.po +++ b/i18n/ur.po @@ -1,14 +1,14 @@ # # Translators: -# Philip Larsen Donnelly, 2024 # Viktor Varland , 2024 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Urdu (https://app.transifex.com/hisp-uio/teams/100509/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,6 +37,39 @@ msgid "" "again, but be aware that this will close other versions." msgstr "" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "" + +msgid "New event" +msgstr "نئی تقریب" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "تلاش کریں" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "مزید" @@ -289,9 +322,6 @@ msgstr "" msgid "No, cancel" msgstr "" -msgid "New event" -msgstr "نئی تقریب" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -505,9 +535,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "تلاش کریں" - msgid "Clear" msgstr "کلیئر" @@ -665,7 +692,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -840,9 +869,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "" - msgid "View changelog" msgstr "" @@ -878,15 +904,6 @@ msgstr "" msgid "Organisation unit could not be loaded" msgstr "" -msgid "Dashboard" -msgstr "ڈیشبورڈ" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "منتخب کردہ پروگرام" @@ -913,6 +930,9 @@ msgstr "لوڈ کر رہا ہے" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "" @@ -1051,7 +1071,7 @@ msgstr "" msgid "Assigned to" msgstr "مقرر کیا، مقرر کرنا" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1060,7 +1080,7 @@ msgstr "ترمیم" msgid "No one is assigned to this event" msgstr "" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1234,6 +1254,9 @@ msgstr "وارنگ" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "" @@ -1252,9 +1275,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1450,10 +1470,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1489,6 +1517,12 @@ msgstr "" msgid "Value" msgstr "قدر" +msgid "File" +msgstr "فائل" + +msgid "Image" +msgstr "تصویر" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1549,6 +1583,46 @@ msgstr "" msgid "an error occurred loading working lists" msgstr "" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "" @@ -1564,13 +1638,120 @@ msgstr "" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" +msgstr[1] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" +msgstr[1] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" +msgstr[1] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" +msgstr[1] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" +msgstr[1] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1582,6 +1763,14 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" +msgstr[1] "" + +msgid "Deselect all" +msgstr "سب کو منتخب کریں" + msgid "Update view" msgstr "" diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index a397b0df49..df5e775c4a 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -1,11 +1,12 @@ # # Translators: +# Philip Larsen Donnelly, 2024 # Khurshid Ibatov , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Khurshid Ibatov , 2024\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" @@ -42,6 +43,39 @@ msgstr "" "ишлашини қўллаб қувватлайди. Ушбу версияни қайта ишлатмоқчи бўлсангиз, " "Илтимос, саҳифани янгиланг, аммо бошқа версиялар ёпилишини унутманг." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Ҳодиса/тадбирни таҳрирланг" + +msgid "New event" +msgstr "Янги ҳодиса" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Излаш" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Кўпроқ" @@ -301,9 +335,6 @@ msgstr "Ҳа, ўзгартиришлар бекор қилинсин" msgid "No, cancel" msgstr "Йўқ, бекор қилинг" -msgid "New event" -msgstr "Янги ҳодиса" - msgid "You don't have access to create an event in the current selections" msgstr "Ҳозирги танловларда ҳодиса/тадбир яратиш ҳуқуқига эга эмассиз" @@ -522,9 +553,6 @@ msgstr "" msgid "No match found" msgstr "Ҳеч нима топилмади" -msgid "Search" -msgstr "Излаш" - msgid "Clear" msgstr "Тозалаш" @@ -686,7 +714,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -866,9 +896,6 @@ msgstr "ҳодиса/тадбир" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "Ҳодиса/тадбирни таҳрирланг" - msgid "View changelog" msgstr "" @@ -906,15 +933,6 @@ msgstr "Ҳодиса/тадбирни юклаб бўлмади" msgid "Organisation unit could not be loaded" msgstr "Ташкилий бўлимни юклаб бўлмади" -msgid "Dashboard" -msgstr "Бошқарув панели" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Танланган дастур" @@ -940,6 +958,9 @@ msgstr "Юкланмоқда" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "Бўлиши мумкин бўлган нусхалар топилди" @@ -1084,7 +1105,7 @@ msgstr "" msgid "Assigned to" msgstr "Тайинланган" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1093,7 +1114,7 @@ msgstr "Таҳрирлаш" msgid "No one is assigned to this event" msgstr "Ушбу ҳодиса/тадбирга ҳеч ким бириктирилмаган" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1268,6 +1289,9 @@ msgstr "Огоҳлантириш" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Ҳодиса/тадбирни ўчириб ташлаш" @@ -1286,9 +1310,6 @@ msgstr "Ҳодиса/тадбир якунланди" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1482,10 +1503,18 @@ msgstr "" msgid "Stages and Events" msgstr "Босқичлар ва Ҳодиса/тадбирлар" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1521,6 +1550,12 @@ msgstr "" msgid "Value" msgstr "Қиймат" +msgid "File" +msgstr "Файл" + +msgid "Image" +msgstr "Расм" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1581,6 +1616,46 @@ msgstr "Маълумотларни юклаб олиш ..." msgid "an error occurred loading working lists" msgstr "ишчи рўйхатни юклашда хатолик юз берди" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Рўйхатга олинган сана" @@ -1596,13 +1671,112 @@ msgstr "Кузатиб бориш" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1614,6 +1788,13 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "{{count}} танланган" + +msgid "Deselect all" +msgstr "Барча танланганни бекор қилиш" + msgid "Update view" msgstr "Янгиланган кўриниш" diff --git a/i18n/uz_UZ_Latn.po b/i18n/uz_UZ_Latn.po index cbb6637b95..d9ed7347e7 100644 --- a/i18n/uz_UZ_Latn.po +++ b/i18n/uz_UZ_Latn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Yury Rogachev , 2024\n" "Language-Team: Uzbek (Latin) (https://app.transifex.com/hisp-uio/teams/100509/uz@Latn/)\n" @@ -44,6 +44,39 @@ msgstr "" "ishlatmoqchi boʼlsangiz, Iltimos, sahifani yangilang, ammo boshqa versiyalar" " yopilishini unutmang." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Hodisa/tadbirni tahrirlang" + +msgid "New event" +msgstr "Yangi hodisa" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Izlash" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Koʼproq" @@ -302,9 +335,6 @@ msgstr "" msgid "No, cancel" msgstr "Yoʼq, bekor qiling" -msgid "New event" -msgstr "Yangi hodisa" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -523,9 +553,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "Izlash" - msgid "Clear" msgstr "Tozalash" @@ -683,7 +710,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -858,9 +887,6 @@ msgstr "" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "Hodisa/tadbirni tahrirlang" - msgid "View changelog" msgstr "" @@ -899,15 +925,6 @@ msgstr "Hodisa/tadbirni yuklab boʼlmadi" msgid "Organisation unit could not be loaded" msgstr "Tashkiliy boʼlimni yuklab boʼlmadi" -msgid "Dashboard" -msgstr "Boshqaruv paneli" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Tanlangan dastur" @@ -933,6 +950,9 @@ msgstr "Yuklanmoqda" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "Boʼlishi mumkin boʼlgan nusxalar topildi" @@ -1075,7 +1095,7 @@ msgstr "" msgid "Assigned to" msgstr "" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1084,7 +1104,7 @@ msgstr "Tahrirlash" msgid "No one is assigned to this event" msgstr "Ushbu hodisa/tadbirga hech kim biriktirilmagan" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1258,6 +1278,9 @@ msgstr "Ogohlantirish" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Hodisa/tadbirni oʼchirib tashlash" @@ -1276,9 +1299,6 @@ msgstr "" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1471,10 +1491,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1510,6 +1538,12 @@ msgstr "" msgid "Value" msgstr "Қиймат" +msgid "File" +msgstr "Fayl" + +msgid "Image" +msgstr "Rasm" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1570,6 +1604,46 @@ msgstr "Maʼlumotlarni yuklab olish ..." msgid "an error occurred loading working lists" msgstr "ishchi roʼyxatni yuklashda xatolik yuz berdi" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Roʼyxatga olingan sana" @@ -1585,13 +1659,112 @@ msgstr "Kuzatib borish" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1603,6 +1776,13 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "" + +msgid "Deselect all" +msgstr "Barcha tanlanganni bekor qilish" + msgid "Update view" msgstr "Yangilangan koʼrinish" diff --git a/i18n/vi.po b/i18n/vi.po index 5ca15df651..813e4fe880 100644 --- a/i18n/vi.po +++ b/i18n/vi.po @@ -1,16 +1,16 @@ # # Translators: # Mai Nguyen , 2024 +# Thuy Nguyen , 2024 # Viktor Varland , 2024 # Philip Larsen Donnelly, 2024 -# Thuy Nguyen , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Thuy Nguyen , 2024\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,6 +45,39 @@ msgstr "" " Vui lòng làm mới trang này nếu bạn muốn sử dụng lại phiên bản này, nhưng " "lưu ý rằng điều này sẽ đóng các phiên bản khác." +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "Sửa sự kiện" + +msgid "New event" +msgstr "Sự kiện mới" + +msgid "Active enrollments" +msgstr "" + +msgid "Completed enrollments" +msgstr "" + +msgid "Cancelled enrollments" +msgstr "" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "Tìm kiếm" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "Thêm" @@ -301,9 +334,6 @@ msgstr "" msgid "No, cancel" msgstr "Không" -msgid "New event" -msgstr "Sự kiện mới" - msgid "You don't have access to create an event in the current selections" msgstr "" @@ -520,9 +550,6 @@ msgstr "" msgid "No match found" msgstr "" -msgid "Search" -msgstr "Tìm kiếm" - msgid "Clear" msgstr "Xóa" @@ -680,7 +707,9 @@ msgstr "" msgid "Add new enrollment for {{teiDisplayName}} in this program." msgstr "" -msgid "No access to program owner." +msgid "" +"You do not have permissions to access to this program, registering unit or " +"record, contact your administrator for more information." msgstr "" msgid "{{teiDisplayName}} is not enrolled in this program." @@ -855,9 +884,6 @@ msgstr "sự kiện" msgid "You don't have access to edit this event" msgstr "" -msgid "Edit event" -msgstr "Sửa sự kiện" - msgid "View changelog" msgstr "" @@ -895,15 +921,6 @@ msgstr "Không thể tải sự kiện" msgid "Organisation unit could not be loaded" msgstr "Không thể tải đơn vị" -msgid "Dashboard" -msgstr "Bảng điều khiển" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "Chương trình đã chọn" @@ -929,6 +946,9 @@ msgstr "Đang tải" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "" + msgid "Possible duplicates found" msgstr "Có thể tìm thấy các bản sao" @@ -1073,7 +1093,7 @@ msgstr "" msgid "Assigned to" msgstr "Đã gán cho" -msgid "You don't have access to edit this assignee" +msgid "You don't have access to edit the assigned user" msgstr "" msgid "Edit" @@ -1082,7 +1102,7 @@ msgstr "Chỉnh sửa" msgid "No one is assigned to this event" msgstr "Không ai được chỉ định cho sự kiện này" -msgid "You don't have access to assign an assignee" +msgid "You don't have access to assign a user to this event" msgstr "" msgid "Assign" @@ -1256,6 +1276,9 @@ msgstr "Cảnh báo" msgid "stage not found in rules execution" msgstr "" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "Xóa sự kiện" @@ -1274,9 +1297,6 @@ msgstr "Sự kiện đã hoàn tất" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "" - msgid "Notes about this event" msgstr "" @@ -1469,10 +1489,18 @@ msgstr "" msgid "Stages and Events" msgstr "" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1508,6 +1536,12 @@ msgstr "" msgid "Value" msgstr "Giá trị" +msgid "File" +msgstr "Tập tin" + +msgid "Image" +msgstr "Hình ảnh" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1568,6 +1602,46 @@ msgstr "Tải xuống dữ liệu ..." msgid "an error occurred loading working lists" msgstr "đã xảy ra lỗi khi tải danh sách làm việc" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "Một lỗi không xác định đã xuất hiện." + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "Ngày đăng ký" @@ -1583,13 +1657,112 @@ msgstr "Theo dõi" msgid "Choose a program stage to filter by {{label}}" msgstr "" -msgid "Active enrollments" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." msgstr "" -msgid "Completed enrollments" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." msgstr "" -msgid "Cancelled enrollments" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" msgstr "" msgid "Working list could not be updated" @@ -1601,6 +1774,13 @@ msgstr "" msgid "an error occurred loading Tracked entity instance lists" msgstr "" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "Đã chọn {{count}}" + +msgid "Deselect all" +msgstr "Bỏ chọn tất cả" + msgid "Update view" msgstr "Cập nhật chế độ xem" diff --git a/i18n/zh.po b/i18n/zh.po index 68c558db1b..fd061b43c0 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -1,16 +1,16 @@ # # Translators: # Philip Larsen Donnelly, 2024 -# 晓东 林 <13981924470@126.com>, 2024 -# Viktor Varland , 2024 # easylin , 2024 +# Viktor Varland , 2024 +# 晓东 林 <13981924470@126.com>, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: easylin , 2024\n" +"Last-Translator: 晓东 林 <13981924470@126.com>, 2024\n" "Language-Team: Chinese (https://app.transifex.com/hisp-uio/teams/100509/zh/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,6 +41,39 @@ msgstr "" "您在同一域中打开了另一个版本的Capture App。当前，Capture " "App仅支持同时运行一个版本（在同一域中）。如果您想再次使用此版本，请刷新此页面，但是请注意，它将关闭其他版本。" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "编辑事件" + +msgid "New event" +msgstr "新事件" + +msgid "Active enrollments" +msgstr "活跃注册" + +msgid "Completed enrollments" +msgstr "完成注册" + +msgid "Cancelled enrollments" +msgstr "取消注册" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "搜索" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "更多" @@ -293,9 +326,6 @@ msgstr "是的，放弃更改" msgid "No, cancel" msgstr "不，取消" -msgid "New event" -msgstr "新事件" - msgid "You don't have access to create an event in the current selections" msgstr "您无权在当前选择中创建活动" @@ -508,9 +538,6 @@ msgstr "键入过滤选项" msgid "No match found" msgstr "未找到匹配项" -msgid "Search" -msgstr "搜索" - msgid "Clear" msgstr "清除" @@ -671,7 +698,7 @@ msgstr "在此计划中为 {{teiDisplayName}} 添加新注册。" msgid "" "You do not have permissions to access to this program, registering unit or " "record, contact your administrator for more information." -msgstr "" +msgstr "您没有访问此项目、注册单元或记录的权限，请联系您的管理员获取更多信息。" msgid "{{teiDisplayName}} is not enrolled in this program." msgstr "该项目未报名{{teiDisplayName}} 。" @@ -846,9 +873,6 @@ msgstr "事件" msgid "You don't have access to edit this event" msgstr "您无权编辑此事件" -msgid "Edit event" -msgstr "编辑事件" - msgid "View changelog" msgstr "查看变更日志" @@ -884,15 +908,6 @@ msgstr "事件不能载入" msgid "Organisation unit could not be loaded" msgstr "机构不能载入" -msgid "Dashboard" -msgstr "仪表盘" - -msgid "Edit Event" -msgstr "编辑事件" - -msgid "View Event" -msgstr "查看活动" - msgid "Selected program" msgstr "选择的项目" @@ -918,6 +933,9 @@ msgstr "载入" msgid "An error occurred while loading the form" msgstr "加载表格时发生错误" +msgid "Back to all stages and events" +msgstr "回到所有阶段和事件" + msgid "Possible duplicates found" msgstr "发现可能的重复" @@ -1059,7 +1077,7 @@ msgid "Assigned to" msgstr "指派到" msgid "You don't have access to edit the assigned user" -msgstr "" +msgstr "您没有编辑已分配用户的权限" msgid "Edit" msgstr "编辑" @@ -1068,7 +1086,7 @@ msgid "No one is assigned to this event" msgstr "没有人被分配到的该事件" msgid "You don't have access to assign a user to this event" -msgstr "" +msgstr "您没有为该事件分配用户的权限" msgid "Assign" msgstr "分配" @@ -1241,6 +1259,9 @@ msgstr "警告" msgid "stage not found in rules execution" msgstr "在规则执行中找不到阶段" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "删除事件" @@ -1259,9 +1280,6 @@ msgstr "事件完成" msgid "The event cannot be edited after it has been completed" msgstr "事件完成后不可编辑" -msgid "Back to all stages and events" -msgstr "回到所有阶段和事件" - msgid "Notes about this event" msgstr "事件注意事项" @@ -1456,11 +1474,19 @@ msgstr "{{ scheduledEvents }} 已安排" msgid "Stages and Events" msgstr "阶段与活动" +msgid "View linked event" +msgstr "查看链接事件" + msgid "An error occurred while loading the widget." msgstr "加载小部件时发生错误。" -msgid "View linked event" -msgstr "查看链接事件" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" +msgstr "" msgid "Scheduled" msgstr "已经调度" @@ -1495,6 +1521,12 @@ msgstr "改变" msgid "Value" msgstr "价值" +msgid "File" +msgstr "文件" + +msgid "Image" +msgstr "图片(PNG)" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "新的 {{trackedEntityTypeName}} 关系" @@ -1555,6 +1587,46 @@ msgstr "下载数据" msgid "an error occurred loading working lists" msgstr "载入工作列表发生错误" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "出现未知错误。" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "登记日期" @@ -1570,14 +1642,113 @@ msgstr "后续跟踪" msgid "Choose a program stage to filter by {{label}}" msgstr "选择要按 {{label}} 筛选的项目阶段" -msgid "Active enrollments" -msgstr "活跃注册" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "完成注册" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "取消注册" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "工作清单无法更新" @@ -1588,6 +1759,13 @@ msgstr "加载工作列表时发生错误" msgid "an error occurred loading Tracked entity instance lists" msgstr "加载跟踪的实体实例列表时出错" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "已选择 {{count}} " + +msgid "Deselect all" +msgstr "取消全选" + msgid "Update view" msgstr "更新视图" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po index 6a0a80ee90..9c459601e7 100644 --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -1,15 +1,15 @@ # # Translators: # Philip Larsen Donnelly, 2024 -# easylin , 2024 # 晓东 林 <13981924470@126.com>, 2024 +# easylin , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n" +"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: 晓东 林 <13981924470@126.com>, 2024\n" +"Last-Translator: easylin , 2024\n" "Language-Team: Chinese (China) (https://app.transifex.com/hisp-uio/teams/100509/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,6 +40,39 @@ msgstr "" "您在同一域中打开了另一个版本的Capture App。当前，Capture " "App仅支持同时运行一个版本（在同一域中）。如果您想再次使用此版本，请刷新此页面，但是请注意，它将关闭其他版本。" +msgid "Enrollment dashboard" +msgstr "" + +msgid "View event" +msgstr "" + +msgid "Edit event" +msgstr "编辑事件" + +msgid "New event" +msgstr "新事件" + +msgid "Active enrollments" +msgstr "活跃注册" + +msgid "Completed enrollments" +msgstr "完成注册" + +msgid "Cancelled enrollments" +msgstr "取消注册" + +msgid "{{trackedEntityName}} list" +msgstr "" + +msgid "Search" +msgstr "搜索" + +msgid "Working List" +msgstr "" + +msgid "Event list" +msgstr "" + msgid "More" msgstr "更多" @@ -292,9 +325,6 @@ msgstr "是的，放弃更改" msgid "No, cancel" msgstr "不，取消" -msgid "New event" -msgstr "新事件" - msgid "You don't have access to create an event in the current selections" msgstr "您无权在当前选择中创建活动" @@ -507,9 +537,6 @@ msgstr "输入筛选选项" msgid "No match found" msgstr "未找到匹配项" -msgid "Search" -msgstr "搜索" - msgid "Clear" msgstr "清除" @@ -845,9 +872,6 @@ msgstr "事件" msgid "You don't have access to edit this event" msgstr "您无权编辑此活动" -msgid "Edit event" -msgstr "编辑事件" - msgid "View changelog" msgstr "" @@ -883,15 +907,6 @@ msgstr "事件不能载入" msgid "Organisation unit could not be loaded" msgstr "机构不能载入" -msgid "Dashboard" -msgstr "仪表盘" - -msgid "Edit Event" -msgstr "" - -msgid "View Event" -msgstr "" - msgid "Selected program" msgstr "选择的项目" @@ -917,6 +932,9 @@ msgstr "载入" msgid "An error occurred while loading the form" msgstr "" +msgid "Back to all stages and events" +msgstr "回到所有阶段和事件" + msgid "Possible duplicates found" msgstr "发现可能的重复" @@ -1240,6 +1258,9 @@ msgstr "警告" msgid "stage not found in rules execution" msgstr "在规则执行中找不到阶段" +msgid "Please provide an valid organisation unit" +msgstr "" + msgid "Delete event" msgstr "删除事件" @@ -1258,9 +1279,6 @@ msgstr "事件完成" msgid "The event cannot be edited after it has been completed" msgstr "" -msgid "Back to all stages and events" -msgstr "回到所有阶段和事件" - msgid "Notes about this event" msgstr "" @@ -1453,10 +1471,18 @@ msgstr "{{ scheduledEvents }} 已调度" msgid "Stages and Events" msgstr "阶段与活动" +msgid "View linked event" +msgstr "" + msgid "An error occurred while loading the widget." msgstr "" -msgid "View linked event" +msgid "Linked event" +msgstr "" + +msgid "" +"This {{stageName}} event is linked to a {{linkedStageName}} event. Review " +"the linked event details before entering data below" msgstr "" msgid "Scheduled" @@ -1492,6 +1518,12 @@ msgstr "" msgid "Value" msgstr "值" +msgid "File" +msgstr "文件" + +msgid "Image" +msgstr "图片(PNG)" + msgid "New {{trackedEntityTypeName}} relationship" msgstr "" @@ -1552,6 +1584,46 @@ msgstr "下载数据" msgid "an error occurred loading working lists" msgstr "载入工作列表发生错误" +msgid "You do not have access to complete events" +msgstr "" + +msgid "Complete events" +msgstr "" + +msgid "Are you sure you want to complete all active events in selection?" +msgstr "" + +msgid "There are no active events to complete in the current selection." +msgstr "" + +msgid "Error completing events" +msgstr "" + +msgid "There was an error completing the events." +msgstr "" + +msgid "Details (Advanced)" +msgstr "" + +msgid "An unknown error occurred." +msgstr "" + +msgid "An error occurred while completing events" +msgstr "" + +msgid "An error occurred while deleting the events" +msgstr "" + +msgid "You do not have access to delete events" +msgstr "" + +msgid "Delete events" +msgstr "" + +msgid "" +"This cannot be undone. Are you sure you want to delete the selected events?" +msgstr "" + msgid "Registration Date" msgstr "登记日期" @@ -1567,14 +1639,113 @@ msgstr "后续跟踪" msgid "Choose a program stage to filter by {{label}}" msgstr "选择要按 {{label}} 筛选的程序阶段" -msgid "Active enrollments" -msgstr "活跃注册" +msgid "" +"Some enrollments were completed successfully, but there was an error while " +"completing the rest. Please see the details below." +msgstr "" -msgid "Completed enrollments" -msgstr "完成注册" +msgid "" +"There was an error while completing the enrollments. Please see the details " +"below." +msgstr "" -msgid "Cancelled enrollments" -msgstr "取消注册" +msgid "" +"An unexpected error occurred while fetching the enrollments. Please try " +"again." +msgstr "" + +msgid "" +"There are currently no active enrollments in the selection. All enrollments " +"are already completed or cancelled." +msgstr "" + +msgid "" +"This action will complete {{count}} active enrollment in your selection." +msgid_plural "" +"This action will complete {{count}} active enrollment in your selection." +msgstr[0] "" + +msgid "{{count}} enrollment already marked as completed will not be changed." +msgid_plural "" +"{{count}} enrollment already marked as completed will not be changed." +msgstr[0] "" + +msgid "Mark all events within enrollments as complete" +msgstr "" + +msgid "You do not have access to bulk complete enrollments" +msgstr "" + +msgid "Complete enrollments" +msgstr "" + +msgid "Error completing enrollments" +msgstr "" + +msgid "No active enrollments to complete" +msgstr "" + +msgid "Complete {{count}} enrollment" +msgid_plural "Complete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when completing the enrollments" +msgstr "" + +msgid "An unknown error occurred when completing enrollments" +msgstr "" + +msgid "You do not have access to delete enrollments" +msgstr "" + +msgid "Delete enrollments" +msgstr "" + +msgid "Delete selected enrollments" +msgstr "" + +msgid "" +"An error occurred while loading the selected enrollments. Please try again." +msgstr "" + +msgid "" +"This action will permanently delete the selected enrollments, including all " +"associated data and events." +msgstr "" + +msgid "Active enrollments ({{count}})" +msgid_plural "Active enrollments ({{count}})" +msgstr[0] "" + +msgid "Completed enrollments ({{count}})" +msgid_plural "Completed enrollments ({{count}})" +msgstr[0] "" + +msgid "Cancelled enrollments ({{count}})" +msgid_plural "Cancelled enrollments ({{count}})" +msgstr[0] "" + +msgid "Delete {{count}} enrollment" +msgid_plural "Delete {{count}} enrollment" +msgstr[0] "" + +msgid "An error occurred when deleting enrollments" +msgstr "" + +msgid "Delete {{ trackedEntityName }} with all enrollments" +msgstr "" + +msgid "Delete {{count}} {{ trackedEntityName }}" +msgid_plural "Delete {{count}} {{ trackedEntityName }}" +msgstr[0] "" + +msgid "" +"Deleting records will also delete any associated enrollments and events. " +"This cannot be undone. Are you sure you want to delete?" +msgstr "" + +msgid "An error occurred while deleting the records" +msgstr "" msgid "Working list could not be updated" msgstr "工作清单无法更新" @@ -1585,6 +1756,13 @@ msgstr "加载工作列表时发生错误" msgid "an error occurred loading Tracked entity instance lists" msgstr "加载跟踪的实体实例列表时出错" +msgid "{{count}} selected" +msgid_plural "{{count}} selected" +msgstr[0] "{{count}} 个已经选择" + +msgid "Deselect all" +msgstr "取消全选" + msgid "Update view" msgstr "更新视图" diff --git a/package.json b/package.json index 4f75109c84..508cea0cfd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.18.0", + "version": "101.19.1", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "101.18.0", + "@dhis2/rules-engine-javascript": "101.19.1", "@dhis2/app-runtime": "^3.9.3", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", @@ -19,7 +19,7 @@ "@dhis2/d2-ui-rich-text": "^7.4.0", "@dhis2/d2-ui-sharing-dialog": "^7.3.3", "@dhis2/ui": "^9.10.1", - "@dhis2-ui/calendar": "10.0.3", + "@dhis2-ui/calendar": "^10.0.3", "@joakim_sm/react-infinite-calendar": "^2.4.2", "@material-ui/core": "3.9.4", "@material-ui/icons": "3", @@ -38,7 +38,7 @@ "loglevel": "^1.9.1", "moment": "^2.29.4", "prop-types": "^15.8.1", - "query-string": "^7.1.1", + "query-string": "^9.1.1", "react": "^16.14.0", "react-addons-update": "^15.6.3", "react-dnd": "^14.0.5", @@ -137,7 +137,7 @@ "@dhis2/app-runtime": "^3.10.2", "@babel/preset-react": "7.16.7", "@dhis2/ui": "^9.10.1", - "@dhis2-ui/calendar": "10.0.3", + "@dhis2-ui/calendar": "^10.0.3", "@js-temporal/polyfill": "0.4.3", "core-js": "2.5.7", "i18next": "^20.5.0" diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index ba125a9d60..b3b3347419 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "101.18.0", + "version": "101.19.1", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { diff --git a/src/core_modules/capture-core-utils/validators/form/date.validator.js b/src/core_modules/capture-core-utils/validators/form/date.validator.js deleted file mode 100644 index fe14203f11..0000000000 --- a/src/core_modules/capture-core-utils/validators/form/date.validator.js +++ /dev/null @@ -1,13 +0,0 @@ -// @flow -import { parseDate } from '../../parsers'; -/** - * - * @export - * @param {string} value - * @param {string} format - * @returns {boolean} - */ -export function isValidDate(value: string, format: string) { - const parseData = parseDate(value, format); - return parseData.isValid; -} diff --git a/src/core_modules/capture-core-utils/validators/form/dateTime.validator.js b/src/core_modules/capture-core-utils/validators/form/dateTime.validator.js deleted file mode 100644 index a6de799acf..0000000000 --- a/src/core_modules/capture-core-utils/validators/form/dateTime.validator.js +++ /dev/null @@ -1,20 +0,0 @@ -// @flow -import { isValidDate } from './date.validator'; -import { isValidTime } from './time.validator'; - -type DateTimeValue = { - date?: ?string, - time?: ?string, -}; - -export function isValidDateTime(value: DateTimeValue, dateFormat: string) { - if (!value) return false; - const date = value.date; - const time = value.time; - - if (!date || !time) { - return false; - } - - return (isValidDate(date, dateFormat) && isValidTime(time)); -} diff --git a/src/core_modules/capture-core-utils/validators/form/index.js b/src/core_modules/capture-core-utils/validators/form/index.js index 65af548dde..3355778be3 100644 --- a/src/core_modules/capture-core-utils/validators/form/index.js +++ b/src/core_modules/capture-core-utils/validators/form/index.js @@ -1,7 +1,5 @@ // @flow export { hasValue } from './compulsory.validator'; -export { isValidDate } from './date.validator'; -export { isValidDateTime } from './dateTime.validator'; export { isValidEmail } from './email.validator'; export { isValidInteger } from './integer.validator'; export { isValidPositiveInteger } from './integerPositive.validator'; @@ -11,7 +9,6 @@ export { isValidNumber } from './number.validator'; export { isValidPercentage } from './percentage.validator'; export { isValidTime } from './time.validator'; export { isValidUrl } from './url.validator'; -export { isValidAge } from './age.validator'; export { isValidPhoneNumber } from './phone.validator'; export { isValidOrgUnit } from './orgUnit.validator'; export { isValidCoordinate } from './coordinate.validator'; diff --git a/src/core_modules/capture-core/components/App/withAppUrlSync.js b/src/core_modules/capture-core/components/App/withAppUrlSync.js index 4f6980e195..9bb3b83e9d 100644 --- a/src/core_modules/capture-core/components/App/withAppUrlSync.js +++ b/src/core_modules/capture-core/components/App/withAppUrlSync.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; import { connect } from 'react-redux'; -import { parse, type QueryParameters } from 'query-string'; +import queryString, { type QueryParameters } from 'query-string'; import { paramsSelector } from './appSync.selectors'; import { LoadingMaskForPage } from '../LoadingMasks'; import { viewEventFromUrl } from '../Pages/ViewEvent/ViewEventComponent/viewEvent.actions'; @@ -81,7 +81,7 @@ export const withAppUrlSync = () => (InnerComponent: React.ComponentType) = setPageAndParams() { const { location } = this.props; this.page = location.pathname.substring(1); - this.params = parse(location && location.search); + this.params = queryString.parse(location && location.search); } render() { diff --git a/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js b/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js index c5aa1266a8..31d6d45b1a 100644 --- a/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js +++ b/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js @@ -11,7 +11,7 @@ import { buildField } from './field/buildField'; import { validationStrategies } from '../../metaData/RenderFoundation/renderFoundation.const'; import type { CustomForm, DataElement } from '../../metaData'; import { messageStateKeys } from '../../reducers/descriptions/rulesEffects.reducerDescription'; -import { validatorTypes } from './field/validators/constants'; +import { validatorTypes } from '../../utils/validation/constants'; import type { QuerySingleResource } from '../../utils/api/api.types'; import { FormFieldPlugin } from './FormFieldPlugin'; import { FormFieldPluginConfig } from '../../metaData/FormFieldPluginConfig'; diff --git a/src/core_modules/capture-core/components/D2Form/D2SectionFields.container.js b/src/core_modules/capture-core/components/D2Form/D2SectionFields.container.js index 0ce87af445..39bfcce74b 100644 --- a/src/core_modules/capture-core/components/D2Form/D2SectionFields.container.js +++ b/src/core_modules/capture-core/components/D2Form/D2SectionFields.container.js @@ -16,7 +16,7 @@ const makeMapStateToProps = () => { const getRulesMessages = makeGetMessages(); const getCompulsory = makeGetCompulsory(); const getDisabled = makeGetDisabled(); - const mapStateToProps = (state: Object, props: { formId: string }) => ({ + const mapStateToProps = (state: Object, props: { formId: string, fieldsMetaData: any }) => ({ values: getSectionValues(state, props), rulesHiddenFields: getHiddenFields(state, props), rulesMessages: getRulesMessages(state, props), diff --git a/src/core_modules/capture-core/components/D2Form/FormBuilder/FormBuilder.component.js b/src/core_modules/capture-core/components/D2Form/FormBuilder/FormBuilder.component.js index f62a5c32f0..9f07004ebb 100644 --- a/src/core_modules/capture-core/components/D2Form/FormBuilder/FormBuilder.component.js +++ b/src/core_modules/capture-core/components/D2Form/FormBuilder/FormBuilder.component.js @@ -11,24 +11,17 @@ import isObject from 'd2-utilizr/lib/isObject'; import defaultClasses from './formBuilder.module.css'; import type { ErrorData, PostProcessErrorMessage } from './formbuilder.types'; import type { PluginContext } from '../FormFieldPlugin/FormFieldPlugin.types'; -import { getValidators } from '../field/validators'; +import { getValidators, validateValue, validatorTypes } from '../../../utils/validation'; +import type { ValidatorContainer } from '../../../utils/validation'; import type { DataElement } from '../../../metaData'; import type { QuerySingleResource } from '../../../utils/api'; -export type ValidatorContainer = { - validator: (value: any, validationContext: ?Object) => boolean | Promise, - message: string, - validatingMessage?: ?string, - type?: ?string, - async?: ?boolean, -}; - export type FieldConfig = { id: string, component: React.ComponentType, plugin?: boolean, props: Object, - validators?: ?Array, + validators?: Array, commitEvent?: ?string, onIsEqual?: ?(newValue: any, oldValue: any) => boolean, }; @@ -36,7 +29,7 @@ export type FieldConfig = { type FieldUI = { touched?: ?boolean, valid?: ?boolean, - errorMessage?: ?string | Array, + errorMessage?: ?string | Array | Array<{[key: string]: string}>, errorType?: ?string, errorData?: ErrorData, validatingMessage?: ?string, @@ -47,7 +40,7 @@ type GetContainerPropsFn = (index: number, fieldsCount: number, field: FieldConf type FieldCommitConfig = {| fieldId: string, - validators?: ?Array, + validators?: Array, onIsEqual?: ?(newValue: any, oldValue: any) => boolean, |} @@ -89,64 +82,22 @@ type Props = { onPostProcessErrorMessage?: PostProcessErrorMessage, }; -type FieldCommitOptions = { +export type FieldCommitOptions = {| touched?: boolean, valid?: boolean, - error?: string | Array, -}; + error?: string | Array | Array<{[key: string]: string}>, + errorCode?: string, +|}; + +export type FieldCommitOptionsExtended = {| + ...FieldCommitOptions, + plugin?: ?boolean, +|}; // container for handling async validations type FieldsValidatingPromiseContainer = { [fieldId: string]: ?{ cancelableValidatingPromise?: ?CancelablePromise, validatingCompleteUid: string } }; export class FormBuilder extends React.Component { - static async validateField( - { validators }: { validators?: ?Array }, - value: any, - validationContext: ?Object, - onIsValidatingInternal: ?Function, - ): Promise<{ valid: boolean, errorMessage?: ?string, errorType?: ?string }> { - if (!validators || validators.length === 0) { - return { - valid: true, - }; - } - - const validatorResult = await validators - .reduce(async (passPromise, currentValidator) => { - const pass = await passPromise; - if (pass === true) { - let result = currentValidator.validator(value, validationContext); - if (result instanceof Promise) { - result = onIsValidatingInternal ? onIsValidatingInternal(currentValidator.validatingMessage, result) : result; - result = await result; - } - - if (result === true || (result && result.valid)) { - return true; - } - return { - message: (result && result.errorMessage) || currentValidator.message, - type: currentValidator.type, - data: result && result.data, - }; - } - return pass; - }, Promise.resolve(true)); - - if (validatorResult !== true) { - return { - valid: false, - errorMessage: validatorResult.message, - errorType: validatorResult.type, - errorData: validatorResult.data, - }; - } - - return { - valid: true, - }; - } - static getAsyncUIState(fieldsUI: { [id: string]: FieldUI }) { return Object.keys(fieldsUI).reduce((accAsyncUIState, fieldId) => { const fieldUI = fieldsUI[fieldId]; @@ -219,12 +170,12 @@ export class FormBuilder extends React.Component { let validationData; try { - validationData = await FormBuilder.validateField( - field, - values[field.id], + validationData = await validateValue({ + validators: field.validators, + value: values[field.id], validationContext, - handleIsValidatingInternal, - ); + postProcessAsyncValidatonInitiation: handleIsValidatingInternal, + }); } catch (reason) { if (reason && isObject(reason) && reason.isCanceled) { validationData = null; @@ -377,7 +328,7 @@ export class FormBuilder extends React.Component { commitFieldUpdateFromDataElement(fieldId: string, value: any, options?: ?FieldCommitOptions) { const { validators, onIsEqual } = this.getFieldProp(fieldId); - + // $FlowFixMe this.commitFieldUpdate({ fieldId, validators, onIsEqual }, value, options); } @@ -387,10 +338,10 @@ export class FormBuilder extends React.Component { const validators = getValidators(fieldMetadata, querySingleResource); // $FlowFixMe - Async handled in business logic - this.commitFieldUpdate({ fieldId, validators }, value, options); + this.commitFieldUpdate({ fieldId, validators }, value, { ...options, plugin: true }); } - async commitFieldUpdate({ fieldId, validators, onIsEqual }: FieldCommitConfig, value: any, options?: ?FieldCommitOptions) { + async commitFieldUpdate({ fieldId, validators, onIsEqual }: FieldCommitConfig, value: any, options?: ?FieldCommitOptionsExtended) { const { onUpdateFieldUIOnly, onUpdateField, @@ -428,49 +379,60 @@ export class FormBuilder extends React.Component { return fieldValidatingPromiseContainer.cancelableValidatingPromise.promise; }; + const updateField = ({ valid, errorMessage, errorType, errorData }) => { + onUpdateField( + value, + { + valid, + touched, + errorMessage, + errorType, + errorData, + }, + fieldId, + id, + fieldValidatingPromiseContainer.validatingCompleteUid, + ); + this.fieldsValidatingPromiseContainer[fieldId] = null; + }; + this.commitUpdateTriggeredForFields[fieldId] = true; - const updatePromise = FormBuilder.validateField( - { validators }, - value, - onGetValidationContext && onGetValidationContext(), - handleIsValidatingInternal, - ) - // $FlowFixMe[prop-missing] automated comment - .then(({ valid, errorMessage, errorType, errorData }) => { - onUpdateField( - value, - { - valid: options?.valid ?? valid, - touched, - errorMessage: options?.error ?? errorMessage, - errorType, - errorData, - }, - fieldId, - id, - fieldValidatingPromiseContainer.validatingCompleteUid, - ); - this.fieldsValidatingPromiseContainer[fieldId] = null; + + options?.plugin && (options.error || options.valid === false) ? + updateField({ + valid: false, + errorMessage: options.error, + errorType: validatorTypes.TYPE_BASE, + errorData: undefined }) : + (await validateValue({ + validators, + value, + validationContext: onGetValidationContext && onGetValidationContext(), + postProcessAsyncValidatonInitiation: handleIsValidatingInternal, + commitOptions: options, }) - .catch((reason) => { - if (!reason || !isObject(reason) || !reason.isCanceled) { - log.error({ reason, fieldId, value }); - onUpdateField( - value, - { - valid: false, - touched: true, - errorMessage: i18n.t('error encountered during field validation'), - errorType: i18n.t('error'), - }, - fieldId, - id, - fieldValidatingPromiseContainer.validatingCompleteUid, - ); - this.fieldsValidatingPromiseContainer[fieldId] = null; - } - }); - await updatePromise; + // $FlowFixMe[prop-missing] automated comment + .then(({ valid, errorMessage, errorType, errorData }) => { + updateField({ valid, errorMessage, errorType, errorData }); + }) + .catch((reason) => { + if (!reason || !isObject(reason) || !reason.isCanceled) { + log.error({ reason, fieldId, value }); + onUpdateField( + value, + { + valid: false, + touched: true, + errorMessage: i18n.t('error encountered during field validation'), + errorType: i18n.t('error'), + }, + fieldId, + id, + fieldValidatingPromiseContainer.validatingCompleteUid, + ); + this.fieldsValidatingPromiseContainer[fieldId] = null; + } + })); } handleUpdateAsyncState = (fieldId: string, asyncStateToAdd: Object) => { diff --git a/src/core_modules/capture-core/components/D2Form/FormBuilder/formbuilder.types.js b/src/core_modules/capture-core/components/D2Form/FormBuilder/formbuilder.types.js index e5e5a78793..99b480e90d 100644 --- a/src/core_modules/capture-core/components/D2Form/FormBuilder/formbuilder.types.js +++ b/src/core_modules/capture-core/components/D2Form/FormBuilder/formbuilder.types.js @@ -7,10 +7,10 @@ export type ErrorData = { attributeValueExistsUnsaved?: ?boolean, }; export type PostProcessErrorMessage = ({ - errorMessage: string | Array, + errorMessage: string | Array | Array<{[key: string]: string}>, errorType: ?string, errorData?: ErrorData, id: string, fieldId: string, fieldLabel: string, -}) => Node; +}) => string | Array | Array<{[key: string]: string}> | Node; diff --git a/src/core_modules/capture-core/components/D2Form/FormBuilder/index.js b/src/core_modules/capture-core/components/D2Form/FormBuilder/index.js index 42434e8133..fab5ff84f6 100644 --- a/src/core_modules/capture-core/components/D2Form/FormBuilder/index.js +++ b/src/core_modules/capture-core/components/D2Form/FormBuilder/index.js @@ -1,4 +1,4 @@ // @flow export { FormBuilder } from './FormBuilder.component'; export type { PostProcessErrorMessage, ErrorData } from './formbuilder.types'; -export type { FieldConfig, ValidatorContainer } from './FormBuilder.component'; +export type { FieldConfig, FieldCommitOptionsExtended } from './FormBuilder.component'; diff --git a/src/core_modules/capture-core/components/D2Form/field/configs/base/configBase.js b/src/core_modules/capture-core/components/D2Form/field/configs/base/configBase.js index 9aeec1d79d..f33d880d64 100644 --- a/src/core_modules/capture-core/components/D2Form/field/configs/base/configBase.js +++ b/src/core_modules/capture-core/components/D2Form/field/configs/base/configBase.js @@ -1,7 +1,7 @@ // @flow import { type ComponentType } from 'react'; -import type { ValidatorContainer } from '../../../FormBuilder'; -import { getValidators } from '../../validators'; +import type { ValidatorContainer } from '../../../../../utils/validation'; +import { getValidators } from '../../../../../utils/validation'; import type { DataElement } from '../../../../../metaData'; import type { QuerySingleResource } from '../../../../../utils/api/api.types'; diff --git a/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfig.js b/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfig.js index 9322ab0816..d7a24cb7f3 100644 --- a/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfig.js +++ b/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfig.js @@ -11,11 +11,11 @@ export const getDateTimeFieldConfig = (metaData: MetaDataElement, options: Objec const props = createProps({ formHorizontal: options.formHorizontal, fieldLabelMediaBasedClass: options.fieldLabelMediaBasedClass, - dateWidth: options.formHorizontal ? 150 : '100%', - dateMaxWidth: options.formHorizontal ? 150 : 350, + dateWidth: options.formHorizontal ? '150px' : '100%', + dateMaxWidth: options.formHorizontal ? '150px' : '350px', orientation: options.formHorizontal ? orientations.VERTICAL : orientations.HORIZONTAL, shrinkDisabled: options.formHorizontal, - calendarWidth: options.formHorizontal ? 250 : 350, + calendarWidth: options.formHorizontal ? '250px' : '350px', popupAnchorPosition: getCalendarAnchorPosition(options.formHorizontal), }, options, metaData); diff --git a/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfigForCustomForm.js b/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfigForCustomForm.js index cd8e1d1d99..86024056fc 100644 --- a/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfigForCustomForm.js +++ b/src/core_modules/capture-core/components/D2Form/field/configs/dateTimeField/getDateTimeFieldConfigForCustomForm.js @@ -8,8 +8,8 @@ import type { QuerySingleResource } from '../../../../../utils/api/api.types'; export const getDateTimeFieldConfigForCustomForm = (metaData: MetaDataElement, options: Object, querySingleResource: QuerySingleResource) => { const props = createProps({ dateWidth: '100%', - dateMaxWidth: 350, - calendarWidth: 350, + dateMaxWidth: '350px', + calendarWidth: '350px', orientation: orientations.HORIZONTAL, shrinkDisabled: false, }, metaData); diff --git a/src/core_modules/capture-core/components/D2Form/field/validators/index.js b/src/core_modules/capture-core/components/D2Form/field/validators/index.js deleted file mode 100644 index bc50f272c3..0000000000 --- a/src/core_modules/capture-core/components/D2Form/field/validators/index.js +++ /dev/null @@ -1,2 +0,0 @@ -// @flow -export { getValidators } from './getValidators'; diff --git a/src/core_modules/capture-core/components/D2Form/index.js b/src/core_modules/capture-core/components/D2Form/index.js index ac6560e0f2..8117978a25 100644 --- a/src/core_modules/capture-core/components/D2Form/index.js +++ b/src/core_modules/capture-core/components/D2Form/index.js @@ -1,3 +1,4 @@ // @flow export { asyncHandlerActionTypes, asyncUpdateFieldEpic } from './asyncHandlerHOC'; export { D2Form } from './D2Form.container'; +export type { FieldCommitOptionsExtended } from './FormBuilder'; diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.js index f2773e6fbb..18a20c37c4 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.js @@ -115,8 +115,7 @@ const getEnrollmentDateSettings = () => { calendarMaxMoment: !props.enrollmentMetadata.allowFutureEnrollmentDate ? moment() : undefined, }), getPropName: () => 'enrolledAt', - getValidatorContainers: (props: Object) => - getEnrollmentDateValidatorContainer(props.enrollmentMetadata.allowFutureEnrollmentDate), + getValidatorContainers: getEnrollmentDateValidatorContainer, getPassOnFieldData: () => true, getMeta: () => ({ placement: placements.TOP, @@ -165,8 +164,7 @@ const getIncidentDateSettings = () => { }), getPropName: () => 'occurredAt', getPassOnFieldData: () => true, - getValidatorContainers: (props: Object) => - getIncidentDateValidatorContainer(props.enrollmentMetadata.allowFutureIncidentDate), + getValidatorContainers: getIncidentDateValidatorContainer, getMeta: () => ({ placement: placements.TOP, section: sectionKeysForEnrollmentDataEntry.ENROLLMENT, @@ -421,17 +419,38 @@ export class EnrollmentDataEntryComponent extends React.Component) => { const { programId, orgUnit, firstStageMetaData, formFoundation } = this.props; - this.props.onUpdateField(...args, programId, orgUnit, firstStageMetaData?.stage, formFoundation); - } + this.props.onUpdateField( + ...args, + programId, + orgUnit, + firstStageMetaData?.stage, + formFoundation, + this.getValidationContext, + ); + }; handleUpdateDataEntryField = (...args: Array) => { const { programId, orgUnit, firstStageMetaData, formFoundation } = this.props; - this.props.onUpdateDataEntryField(...args, programId, orgUnit, firstStageMetaData?.stage, formFoundation); + this.props.onUpdateDataEntryField( + ...args, + programId, + orgUnit, + firstStageMetaData?.stage, + formFoundation, + this.getValidationContext, + ); } handleStartAsyncUpdateField = (...args: Array) => { const { programId, orgUnit, firstStageMetaData, formFoundation } = this.props; - this.props.onStartAsyncUpdateField(...args, programId, orgUnit, firstStageMetaData?.stage, formFoundation); + this.props.onStartAsyncUpdateField( + ...args, + programId, + orgUnit, + firstStageMetaData?.stage, + formFoundation, + this.getValidationContext, + ); } render() { diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.container.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.container.js index 6df22c0f34..4bf992d94a 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.container.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.container.js @@ -14,8 +14,11 @@ const mapDispatchToProps = (dispatch: ReduxDispatch) => ({ orgUnit: OrgUnit, stage?: ProgramStage, formFoundation: RenderFoundation, + onGetValidationContext: () => Object, ) => { - dispatch(updateDataEntryFieldBatch(innerAction, programId, orgUnit, stage, formFoundation)); + dispatch( + updateDataEntryFieldBatch(innerAction, programId, orgUnit, stage, formFoundation, onGetValidationContext), + ); }, onUpdateField: ( innerAction: ReduxAction, @@ -23,8 +26,9 @@ const mapDispatchToProps = (dispatch: ReduxDispatch) => ({ orgUnit: OrgUnit, stage?: ProgramStage, formFoundation: RenderFoundation, + onGetValidationContext: () => Object, ) => { - dispatch(updateFieldBatch(innerAction, programId, orgUnit, stage, formFoundation)); + dispatch(updateFieldBatch(innerAction, programId, orgUnit, stage, formFoundation, onGetValidationContext)); }, onStartAsyncUpdateField: ( innerAction: ReduxAction, @@ -34,9 +38,10 @@ const mapDispatchToProps = (dispatch: ReduxDispatch) => ({ orgUnit: OrgUnit, stage?: ProgramStage, formFoundation: RenderFoundation, + onGetValidationContext: () => Object, ) => { const onAsyncUpdateSuccess = (successInnerAction: ReduxAction) => - asyncUpdateSuccessBatch(successInnerAction, dataEntryId, itemId, programId, orgUnit, stage, formFoundation); + asyncUpdateSuccessBatch(successInnerAction, dataEntryId, itemId, programId, orgUnit, stage, formFoundation, onGetValidationContext); const onAsyncUpdateError = (errorInnerAction: ReduxAction) => errorInnerAction; dispatch(startAsyncUpdateFieldForNewEnrollment(innerAction, onAsyncUpdateSuccess, onAsyncUpdateError)); diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentWithFirstStageDataEntry/fieldValidators/eventDate.validatorContainersGetter.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentWithFirstStageDataEntry/fieldValidators/eventDate.validatorContainersGetter.js index 3cb0a56c19..2f9290b07a 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentWithFirstStageDataEntry/fieldValidators/eventDate.validatorContainersGetter.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentWithFirstStageDataEntry/fieldValidators/eventDate.validatorContainersGetter.js @@ -1,14 +1,14 @@ // @flow -import { hasValue } from 'capture-core-utils/validators/form'; import i18n from '@dhis2/d2-i18n'; -import { isValidDate } from '../../../../../utils/validators/form'; +import { hasValue } from 'capture-core-utils/validators/form'; +import { isValidDate } from '../../../../../utils/validation/validators/form'; -const preValidateDate = (value?: ?string) => { +const preValidateDate = (value?: ?string, internalComponentError: ?{error?: ?string, errorCode?: ?string}) => { if (!value) { return true; } - return isValidDate(value); + return isValidDate(value, internalComponentError); }; export const getEventDateValidatorContainers = () => { diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actionBatchs.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actionBatchs.js index f84452c7fe..da21783486 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actionBatchs.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actionBatchs.js @@ -6,11 +6,16 @@ import type { TEIValues, OrgUnit, } from '@dhis2/rules-engine-javascript'; -import { getApplicableRuleEffectsForTrackerProgram, updateRulesEffects } from '../../../../rules'; +import { + getApplicableRuleEffectsForTrackerProgram, + updateRulesEffects, + validateAssignEffects, +} from '../../../../rules'; import { rulesExecutedPostUpdateField } from '../../../DataEntry/actions/dataEntry.actions'; import { TrackerProgram, RenderFoundation, ProgramStage } from '../../../../metaData'; import { startRunRulesPostUpdateField } from '../../../DataEntry'; import { startRunRulesOnUpdateForNewEnrollment } from './enrollment.actions'; +import type { QuerySingleResource } from '../../../../utils/api'; export const batchActionTypes = { RULES_EXECUTED_POST_UPDATE_FIELD_FOR_ENROLLMENT: 'RulesExecutedPostUpdateFieldForEnrollment', @@ -18,7 +23,7 @@ export const batchActionTypes = { UPDATE_DATA_ENTRY_FIELD_NEW_ENROLLMENT_ACTION_BATCH: 'UpdateDataEntryFieldNewEnrollmentActionBatch', }; -export const runRulesOnUpdateFieldBatch = ({ +export const runRulesOnUpdateFieldBatch = async ({ program, formId, dataEntryId, @@ -31,6 +36,8 @@ export const runRulesOnUpdateFieldBatch = ({ stage, formFoundation, currentEvent, + querySingleResource, + onGetValidationContext, }: { program: TrackerProgram, formId: string, @@ -41,9 +48,11 @@ export const runRulesOnUpdateFieldBatch = ({ attributeValues?: TEIValues, extraActions: Array>, uid: string, - stage?: ProgramStage, + stage: ProgramStage, formFoundation?: RenderFoundation, currentEvent?: {[id: string]: any}, + querySingleResource: QuerySingleResource, + onGetValidationContext: () => Object, }) => { const effects = getApplicableRuleEffectsForTrackerProgram({ program, @@ -54,8 +63,16 @@ export const runRulesOnUpdateFieldBatch = ({ attributeValues, formFoundation, }); + + const effectsWithValidations = await validateAssignEffects({ + dataElements: formFoundation ? formFoundation.getElements() : program.attributes, + effects, + querySingleResource, + onGetValidationContext, + }); + return batchActions([ - updateRulesEffects(effects, formId), + updateRulesEffects(effectsWithValidations, formId), rulesExecutedPostUpdateField(dataEntryId, itemId, uid), ...extraActions, ], batchActionTypes.RULES_EXECUTED_POST_UPDATE_FIELD_FOR_ENROLLMENT); @@ -67,15 +84,27 @@ export const updateDataEntryFieldBatch = ( orgUnit: OrgUnit, stage?: ProgramStage, formFoundation: RenderFoundation, + onGetValidationContext: () => Object, ) => { const { dataEntryId, itemId } = innerAction.payload; const uid = uuid(); - return batchActions([ - innerAction, - startRunRulesPostUpdateField(dataEntryId, itemId, uid), - startRunRulesOnUpdateForNewEnrollment(innerAction.payload, uid, programId, orgUnit, stage, formFoundation), - ], batchActionTypes.UPDATE_DATA_ENTRY_FIELD_NEW_ENROLLMENT_ACTION_BATCH); + return batchActions( + [ + innerAction, + startRunRulesPostUpdateField(dataEntryId, itemId, uid), + startRunRulesOnUpdateForNewEnrollment({ + payload: innerAction.payload, + uid, + programId, + orgUnit, + stage, + formFoundation, + onGetValidationContext, + }), + ], + batchActionTypes.UPDATE_DATA_ENTRY_FIELD_NEW_ENROLLMENT_ACTION_BATCH, + ); }; export const updateFieldBatch = ( @@ -84,15 +113,27 @@ export const updateFieldBatch = ( orgUnit: OrgUnit, stage?: ProgramStage, formFoundation: RenderFoundation, + onGetValidationContext: () => Object, ) => { const { dataEntryId, itemId } = innerAction.payload; const uid = uuid(); - return batchActions([ - innerAction, - startRunRulesPostUpdateField(dataEntryId, itemId, uid), - startRunRulesOnUpdateForNewEnrollment(innerAction.payload, uid, programId, orgUnit, stage, formFoundation), - ], batchActionTypes.UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH); + return batchActions( + [ + innerAction, + startRunRulesPostUpdateField(dataEntryId, itemId, uid), + startRunRulesOnUpdateForNewEnrollment({ + payload: innerAction.payload, + uid, + programId, + orgUnit, + stage, + formFoundation, + onGetValidationContext, + }), + ], + batchActionTypes.UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH, + ); }; export const asyncUpdateSuccessBatch = ( @@ -103,12 +144,24 @@ export const asyncUpdateSuccessBatch = ( orgUnit: OrgUnit, stage?: ProgramStage, formFoundation: RenderFoundation, + onGetValidationContext: () => Object, ) => { const uid = uuid(); - return batchActions([ - innerAction, - startRunRulesPostUpdateField(dataEntryId, itemId, uid), - startRunRulesOnUpdateForNewEnrollment({ ...innerAction.payload, dataEntryId, itemId }, uid, programId, orgUnit, stage, formFoundation), - ], batchActionTypes.UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH); + return batchActions( + [ + innerAction, + startRunRulesPostUpdateField(dataEntryId, itemId, uid), + startRunRulesOnUpdateForNewEnrollment({ + payload: { ...innerAction.payload, dataEntryId, itemId }, + uid, + programId, + orgUnit, + stage, + formFoundation, + onGetValidationContext, + }), + ], + batchActionTypes.UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH, + ); }; diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actions.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actions.js index 68d8a8cb7e..e0e0bbe343 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actions.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actions.js @@ -7,16 +7,32 @@ export const actionTypes = { START_RUN_RULES_ON_UPDATE: 'StartRunRulesOnUpdateForNewEnrollment', }; -export const startRunRulesOnUpdateForNewEnrollment = ( +export const startRunRulesOnUpdateForNewEnrollment = ({ + payload, + uid, + programId, + orgUnit, + stage, + formFoundation, + onGetValidationContext, +}: { payload: Object, uid: string, programId: string, orgUnit: OrgUnit, stage?: ProgramStage, formFoundation: RenderFoundation, -) => - actionCreator(actionTypes.START_RUN_RULES_ON_UPDATE)( - { innerPayload: payload, uid, programId, orgUnit, stage, formFoundation }); + onGetValidationContext: () => Object, +}) => + actionCreator(actionTypes.START_RUN_RULES_ON_UPDATE)({ + innerPayload: payload, + uid, + programId, + orgUnit, + stage, + formFoundation, + onGetValidationContext, + }); export const startAsyncUpdateFieldForNewEnrollment = ( innerAction: ReduxAction, diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/epics/enrollment.epics.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/epics/enrollment.epics.js index 9bc4da634a..77ee439a01 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/epics/enrollment.epics.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/epics/enrollment.epics.js @@ -1,7 +1,8 @@ // @flow import type { OrgUnit } from '@dhis2/rules-engine-javascript'; import { ofType } from 'redux-observable'; -import { map } from 'rxjs/operators'; +import { from } from 'rxjs'; +import { map, switchMap } from 'rxjs/operators'; import { batchActionTypes, runRulesOnUpdateFieldBatch } from '../actions/enrollment.actionBatchs'; import { actionTypes } from '../actions/enrollment.actions'; import { getTrackerProgramThrowIfNotFound, ProgramStage, RenderFoundation, Section } from '../../../../metaData'; @@ -9,6 +10,7 @@ import { getCurrentClientMainData, type FieldData } from '../../../../rules'; import { getDataEntryKey } from '../../../DataEntry/common/getDataEntryKey'; import { convertFormToClient } from '../../../../converters'; import { stageMainDataIds, convertToRulesEngineIds } from '../EnrollmentWithFirstStageDataEntry'; +import type { QuerySingleResource } from '../../../../utils/api'; type Context = { dataEntryId: string, @@ -16,7 +18,7 @@ type Context = { uid: string, programId: string, orgUnit: OrgUnit, - stage?: ProgramStage, + stage: ProgramStage, formFoundation: RenderFoundation, } @@ -38,46 +40,62 @@ const splitCurrentClientMainData = (stage, currentClientMainData) => { }, { currentEnrollmentValues: {}, currentEventMainData: {} }); }; -const runRulesOnEnrollmentUpdate = - (store: ReduxStore, context: Context, fieldData?: ?FieldData, searchActions?: any = []) => { - const state = store.value; - const { programId, dataEntryId, itemId, orgUnit, uid, stage, formFoundation } = context; - const formId = getDataEntryKey(dataEntryId, itemId); - const program = getTrackerProgramThrowIfNotFound(programId); - const currentFormData = state.formsValues[formId] || {}; - const convertedValues = formFoundation.convertAndGroupBySection(currentFormData, convertFormToClient); - const attributeValues = convertedValues[Section.groups.ENROLLMENT]; - const currentEventValues = convertedValues[Section.groups.EVENT] || {}; - const currentClientMainData = - getCurrentClientMainData(state, itemId, dataEntryId, formFoundation) || {}; - const { currentEnrollmentValues, currentEventMainData } - = splitCurrentClientMainData(state, currentClientMainData); - const currentEvent = stage - ? { ...currentEventValues, ...currentEventMainData, programStageId: stage.id } : undefined; - - return runRulesOnUpdateFieldBatch({ - program, - formId, - dataEntryId, - itemId, - orgUnit, - enrollmentData: currentEnrollmentValues, - attributeValues, - currentEvent, - extraActions: searchActions, - uid, - stage, - formFoundation: stage ? formFoundation : undefined, - }); - }; +const runRulesOnEnrollmentUpdate = ({ + store, + context, + searchActions = [], + querySingleResource, + onGetValidationContext, +}: { + store: ReduxStore, + context: Context, + searchActions?: any, + querySingleResource: QuerySingleResource, + onGetValidationContext: () => Object, +}) => { + const state = store.value; + const { programId, dataEntryId, itemId, orgUnit, uid, stage, formFoundation } = context; + const formId = getDataEntryKey(dataEntryId, itemId); + const program = getTrackerProgramThrowIfNotFound(programId); + const currentFormData = state.formsValues[formId] || {}; + const convertedValues = formFoundation.convertAndGroupBySection(currentFormData, convertFormToClient); + const attributeValues = convertedValues[Section.groups.ENROLLMENT]; + const currentEventValues = convertedValues[Section.groups.EVENT] || {}; + const currentClientMainData = getCurrentClientMainData(state, itemId, dataEntryId, formFoundation) || {}; + const { currentEnrollmentValues, currentEventMainData } = splitCurrentClientMainData(state, currentClientMainData); + const currentEvent = stage + ? { ...currentEventValues, ...currentEventMainData, programStageId: stage.id } + : undefined; + const runRulesOnUpdateFieldBatchPromise = runRulesOnUpdateFieldBatch({ + program, + formId, + dataEntryId, + itemId, + orgUnit, + enrollmentData: currentEnrollmentValues, + attributeValues, + currentEvent, + extraActions: searchActions, + uid, + stage, + formFoundation: stage ? formFoundation : undefined, + querySingleResource, + onGetValidationContext, + }); + return from(runRulesOnUpdateFieldBatchPromise); +}; -export const runRulesOnEnrollmentDataEntryFieldUpdateEpic = (action$: InputObservable, store: ReduxStore) => +export const runRulesOnEnrollmentDataEntryFieldUpdateEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => action$.pipe( ofType(batchActionTypes.UPDATE_DATA_ENTRY_FIELD_NEW_ENROLLMENT_ACTION_BATCH), map(actionBatch => actionBatch.payload.find(action => action.type === actionTypes.START_RUN_RULES_ON_UPDATE)), - map((action) => { + switchMap((action) => { const { uid, programId, @@ -85,6 +103,7 @@ export const runRulesOnEnrollmentDataEntryFieldUpdateEpic = (action$: InputObser innerPayload, stage, formFoundation, + onGetValidationContext, } = action.payload; const { @@ -92,24 +111,42 @@ export const runRulesOnEnrollmentDataEntryFieldUpdateEpic = (action$: InputObser itemId, } = innerPayload; - return runRulesOnEnrollmentUpdate(store, { - dataEntryId, - itemId, - uid, - programId, - orgUnit, - stage, - formFoundation, + return runRulesOnEnrollmentUpdate({ + store, + context: { + dataEntryId, + itemId, + uid, + programId, + orgUnit, + stage, + formFoundation, + }, + querySingleResource, + onGetValidationContext, }); })); -export const runRulesOnEnrollmentFieldUpdateEpic = (action$: InputObservable, store: ReduxStore) => +export const runRulesOnEnrollmentFieldUpdateEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => action$.pipe( ofType(batchActionTypes.UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH), map(actionBatch => actionBatch.payload.find(action => action.type === actionTypes.START_RUN_RULES_ON_UPDATE)), - map((action) => { - const { innerPayload: payload, searchActions, uid, programId, orgUnit, stage, formFoundation } = action.payload; + switchMap((action) => { + const { + innerPayload: payload, + searchActions, + uid, + programId, + orgUnit, + stage, + formFoundation, + onGetValidationContext, + } = action.payload; const { dataEntryId, itemId, elementId, value, uiState } = payload; const fieldData: FieldData = { @@ -118,14 +155,21 @@ export const runRulesOnEnrollmentFieldUpdateEpic = (action$: InputObservable, st valid: uiState.valid, }; - return runRulesOnEnrollmentUpdate(store, { - programId, - orgUnit, - dataEntryId, - itemId, - uid, - stage, - formFoundation, - }, fieldData, searchActions); + return runRulesOnEnrollmentUpdate({ + store, + context: { + programId, + orgUnit, + dataEntryId, + itemId, + uid, + stage, + formFoundation, + }, + fieldData, + searchActions, + querySingleResource, + onGetValidationContext, + }); }), ); diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.js index 731200e7b8..32d0534018 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/enrollmentDate.validatorContainersGetter.js @@ -1,30 +1,17 @@ // @flow -import { hasValue } from 'capture-core-utils/validators/form'; import i18n from '@dhis2/d2-i18n'; -import moment from 'moment'; -import { parseDate } from '../../../../utils/converters/date'; - -const isValidEnrollmentDate = (value: string, isFutureDateAllowed: boolean) => { - const dateContainer = parseDate(value); - if (!dateContainer.isValid) { - return false; - } +import { hasValue } from 'capture-core-utils/validators/form'; +import { isValidDate, isValidNonFutureDate } from '../../../../utils/validation/validators/form'; - if (isFutureDateAllowed) { +const isValidEnrollmentDate = (value: string, internalComponentError?: ?{error: ?string, errorCode: ?string}) => { + if (!value) { return true; } - const momentDate = dateContainer.momentDate; - const momentToday = moment(); - // $FlowFixMe -> if parseDate returns isValid true, there should always be a momentDate - const isNotFutureDate = momentDate.isSameOrBefore(momentToday); - return { - valid: isNotFutureDate, - message: i18n.t('A future date is not allowed'), - }; + return isValidDate(value, internalComponentError); }; -export const getEnrollmentDateValidatorContainer = (isFutureEnrollmentDateAllowed: boolean) => { +export const getEnrollmentDateValidatorContainer = () => { const validatorContainers = [ { validator: hasValue, @@ -32,9 +19,12 @@ export const getEnrollmentDateValidatorContainer = (isFutureEnrollmentDateAllowe i18n.t('A value is required'), }, { - validator: (value: string) => isValidEnrollmentDate(value, isFutureEnrollmentDateAllowed), + validator: isValidEnrollmentDate, message: i18n.t('Please provide a valid date'), }, + { validator: isValidNonFutureDate, + message: i18n.t('A date in the future is not allowed'), + }, ]; return validatorContainers; }; diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/incidentDate.validatorContainerGetter.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/incidentDate.validatorContainerGetter.js index db3331542c..897510621f 100644 --- a/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/incidentDate.validatorContainerGetter.js +++ b/src/core_modules/capture-core/components/DataEntries/Enrollment/fieldValidators/incidentDate.validatorContainerGetter.js @@ -1,31 +1,18 @@ // @flow -import { hasValue } from 'capture-core-utils/validators/form'; import i18n from '@dhis2/d2-i18n'; -import moment from 'moment'; -import { parseDate } from '../../../../utils/converters/date'; - -const isValidIncidentDate = (value: string, isFutureDateAllowed: boolean) => { - const dateContainer = parseDate(value); - if (!dateContainer.isValid) { - return false; - } +import { hasValue } from 'capture-core-utils/validators/form'; +import { isValidDate, isValidNonFutureDate } from '../../../../utils/validation/validators/form'; - if (isFutureDateAllowed) { +const isValidIncidentDate = (value: string, internalComponentError?: ?{error: ?string, errorCode: ?string}) => { + if (!value) { return true; } - const momentDate = dateContainer.momentDate; - const momentToday = moment(); - // $FlowFixMe -> if parseDate returns isValid true, there should always be a momentDate - const isNotFutureDate = momentDate.isSameOrBefore(momentToday); - return { - valid: isNotFutureDate, - message: i18n.t('A future date is not allowed'), - }; + return isValidDate(value, internalComponentError); }; -export const getIncidentDateValidatorContainer = (isFutureIncidentDateAllowed: boolean) => { +export const getIncidentDateValidatorContainer = () => { const validatorContainers = [ { validator: hasValue, @@ -33,9 +20,12 @@ export const getIncidentDateValidatorContainer = (isFutureIncidentDateAllowed: b i18n.t('A value is required'), }, { - validator: (value: string) => isValidIncidentDate(value, isFutureIncidentDateAllowed), + validator: isValidIncidentDate, message: i18n.t('Please provide a valid date'), }, + { validator: isValidNonFutureDate, + message: i18n.t('A date in the future is not allowed'), + }, ]; return validatorContainers; }; diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/newEventDataEntry.epics.js b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/newEventDataEntry.epics.js index 0da25fbb44..006d2a7003 100644 --- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/newEventDataEntry.epics.js +++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/newEventDataEntry.epics.js @@ -1,6 +1,7 @@ // @flow import { ofType } from 'redux-observable'; -import { map, filter } from 'rxjs/operators'; +import { from } from 'rxjs'; +import { map, filter, switchMap } from 'rxjs/operators'; import { batchActions } from 'redux-batched-actions'; import { type OrgUnit } from '@dhis2/rules-engine-javascript'; import { rulesExecutedPostUpdateField } from '../../../../../DataEntry/actions/dataEntry.actions'; @@ -37,6 +38,8 @@ import { actionTypes as crossPageActionTypes } from '../../../../../Pages/action import { lockedSelectorActionTypes } from '../../../../../LockedSelector/LockedSelector.actions'; import { newPageActionTypes } from '../../../../../Pages/New/NewPage.actions'; import { programCollection } from '../../../../../../metaDataMemoryStores'; +import { validateAssignEffects } from '../../../../../../rules'; +import type { QuerySingleResource } from '../../../../../../utils/api'; export const resetDataEntryForNewEventEpic = (action$: InputObservable) => action$.pipe( @@ -121,14 +124,23 @@ export const resetRecentlyAddedEventsWhenNewEventInDataEntryEpic = (action$: Inp })); -const runRulesForNewSingleEvent = ( +const runRulesForNewSingleEvent = async ({ + store, + dataEntryId, + itemId, + uid, + orgUnit, + fieldData, + querySingleResource, +}: { store: ReduxStore, dataEntryId: string, itemId: string, uid: string, orgUnit: OrgUnit, fieldData?: ?FieldData, -) => { + querySingleResource: QuerySingleResource, +}) => { const state = store.value; const formId = getDataEntryKey(dataEntryId, itemId); @@ -147,35 +159,66 @@ const runRulesForNewSingleEvent = ( currentEvent, }); + const effectsWithValidations = await validateAssignEffects({ + dataElements: foundation.getElements(), + effects, + querySingleResource, + }); + return batchActions([ - updateRulesEffects(effects, formId), + updateRulesEffects(effectsWithValidations, formId), rulesExecutedPostUpdateField(dataEntryId, itemId, uid), ], batchActionTypes.RULES_EFFECTS_ACTIONS_BATCH, ); }; -export const runRulesOnUpdateDataEntryFieldForSingleEventEpic = (action$: InputObservable, store: ReduxStore) => +export const runRulesOnUpdateDataEntryFieldForSingleEventEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => action$.pipe( ofType(batchActionTypes.UPDATE_DATA_ENTRY_FIELD_NEW_SINGLE_EVENT_ACTION_BATCH), map(actionBatch => actionBatch.payload.find(action => action.type === newEventDataEntryActionTypes.START_RUN_RULES_ON_UPDATE)), - map((action) => { + switchMap((action) => { const { dataEntryId, itemId, uid, orgUnit } = action.payload; - return runRulesForNewSingleEvent(store, dataEntryId, itemId, uid, orgUnit); + const runRulesForNewSingleEventPromise = runRulesForNewSingleEvent({ + store, + dataEntryId, + itemId, + uid, + orgUnit, + querySingleResource, + }); + return from(runRulesForNewSingleEventPromise); })); -export const runRulesOnUpdateFieldForSingleEventEpic = (action$: InputObservable, store: ReduxStore) => +export const runRulesOnUpdateFieldForSingleEventEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => action$.pipe( ofType(batchActionTypes.UPDATE_FIELD_NEW_SINGLE_EVENT_ACTION_BATCH), map(actionBatch => actionBatch.payload.find(action => action.type === newEventDataEntryActionTypes.START_RUN_RULES_ON_UPDATE)), - map((action) => { + switchMap((action) => { const { dataEntryId, itemId, uid, orgUnit, elementId, value, uiState } = action.payload; const fieldData: FieldData = { elementId, value, valid: uiState.valid, }; - return runRulesForNewSingleEvent(store, dataEntryId, itemId, uid, orgUnit, fieldData); + const runRulesForNewSingleEventPromise = runRulesForNewSingleEvent({ + store, + dataEntryId, + itemId, + uid, + orgUnit, + fieldData, + querySingleResource, + }); + return from(runRulesForNewSingleEventPromise); })); diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js index 31afe2c4da..d1ff0940ed 100644 --- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js +++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js @@ -1,14 +1,14 @@ // @flow import { hasValue } from 'capture-core-utils/validators/form'; import i18n from '@dhis2/d2-i18n'; -import { isValidDate } from '../../../../../../utils/validators/form'; +import { isValidDate } from '../../../../../../utils/validation/validators/form'; -const preValidateDate = (value?: ?string) => { +const preValidateDate = (value?: ?string, internalComponentError?: ?{error: ?string, errorCode: ?string}) => { if (!value) { return true; } - return isValidDate(value); + return isValidDate(value, internalComponentError); }; export const getEventDateValidatorContainers = () => { diff --git a/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/DataEntryField.component.js b/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/DataEntryField.component.js index e20b69cca2..6d25a0c5ed 100644 --- a/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/DataEntryField.component.js +++ b/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/DataEntryField.component.js @@ -36,6 +36,8 @@ type Props = { type Options = { touched?: ?boolean, + error?: ?string, + errorCode?: ?string, }; type ContainerProps = { @@ -72,7 +74,7 @@ class DataEntryFieldPlain extends React.Component { handleSet = (value: any, options?: ?Options) => { const { validatorContainers, onUpdateFieldInner, onUpdateField } = this.props; const validationError = - getValidationError(value, validatorContainers); + getValidationError(value, validatorContainers, { error: options?.error, errorCode: options?.errorCode }); onUpdateFieldInner(value, { isValid: !validationError, validationError, diff --git a/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/dataEntryField.utils.js b/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/dataEntryField.utils.js index 322dfdd783..f42d00f85e 100644 --- a/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/dataEntryField.utils.js +++ b/src/core_modules/capture-core/components/DataEntry/dataEntryField/internal/dataEntryField.utils.js @@ -1,14 +1,16 @@ // @flow import i18n from '@dhis2/d2-i18n'; -type Validator = (value: any) => boolean | { valid: boolean, message: ?string }; +type Validator = (value: any, + internalComponentError?: ?{error: ?string, errorCode: ?string}) => + boolean | { valid: boolean, errorMessage?: ?string } | { valid: boolean, message?: ?string }; export type ValidatorContainer = { validator: Validator, message: string, }; -export function getValidationError(value: any, validatorContainers: ?Array) { +export function getValidationError(value: any, validatorContainers: ?Array, internalComponentError?: ?{error: ?string, errorCode: ?string}) { if (!validatorContainers) { return null; } @@ -16,13 +18,13 @@ export function getValidationError(value: any, validatorContainers: ?Array { const validator = validatorContainer.validator; - const result = validator(value); + const result = validator(value, internalComponentError); if (result === true || (result && result.valid)) { return false; } - message = (result && result.message) || validatorContainer.message; + message = (result && result.errorMessage) || (result && result.message) || validatorContainer.message; return true; }); diff --git a/src/core_modules/capture-core/components/FiltersForTypes/Date/DateFilterManager.component.js b/src/core_modules/capture-core/components/FiltersForTypes/Date/DateFilterManager.component.js index 0971d33264..928d9fd754 100644 --- a/src/core_modules/capture-core/components/FiltersForTypes/Date/DateFilterManager.component.js +++ b/src/core_modules/capture-core/components/FiltersForTypes/Date/DateFilterManager.component.js @@ -8,7 +8,7 @@ import { mainOptionKeys } from './options'; import { dateFilterTypes } from './constants'; import type { DateFilterData } from './types'; import type { Value } from './DateFilter.component'; -import { areRelativeRangeValuesSupported } from '../../../utils/validators/areRelativeRangeValuesSupported'; +import { areRelativeRangeValuesSupported } from '../../../utils/validation/validators/areRelativeRangeValuesSupported'; type Props = { filter: ?DateFilterData, diff --git a/src/core_modules/capture-core/components/FormFields/New/Fields/AgeField/AgeField.component.js b/src/core_modules/capture-core/components/FormFields/New/Fields/AgeField/AgeField.component.js index c92edaa872..2306b0854d 100644 --- a/src/core_modules/capture-core/components/FormFields/New/Fields/AgeField/AgeField.component.js +++ b/src/core_modules/capture-core/components/FormFields/New/Fields/AgeField/AgeField.component.js @@ -3,7 +3,6 @@ import * as React from 'react'; import { withStyles, withTheme } from '@material-ui/core/styles'; import { AgeField as UIAgeField } from 'capture-ui'; import moment from 'moment'; -import { withCalendarProps } from '../../HOC/withCalendarProps'; import { parseDate, convertMomentToDateFormatString } from '../../../../../utils/converters/date'; import { systemSettingsStore } from '../../../../../metaDataMemoryStores'; @@ -41,18 +40,10 @@ type Props = { innerInputInfo: string, innerInputValidating: string, }, - calendarTheme: Object, - calendarLocale: Object, - calendarOnConvertValueIn: Function, - calendarOnConvertValueOut: Function, } const AgeFieldPlain = (props: Props) => { const { - calendarTheme, - calendarLocale, - calendarOnConvertValueIn, - calendarOnConvertValueOut, ...passOnProps } = props; @@ -62,14 +53,10 @@ const AgeFieldPlain = (props: Props) => { onParseDate={parseDate} onGetFormattedDateStringFromMoment={convertMomentToDateFormatString} moment={moment} - dateCalendarTheme={calendarTheme} - dateCalendarLocale={calendarLocale} - dateCalendarOnConvertValueIn={calendarOnConvertValueIn} - dateCalendarOnConvertValueOut={calendarOnConvertValueOut} datePlaceholder={systemSettingsStore.get().dateFormat.toLowerCase()} {...passOnProps} /> ); }; -export const AgeField = withTheme()(withCalendarProps()(withStyles(getStyles)(AgeFieldPlain))); +export const AgeField = withTheme()(withStyles(getStyles)(AgeFieldPlain)); diff --git a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateField/DateField.component.js b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateField/DateField.component.js index f5e1f1ed62..8ed4bf9b8c 100644 --- a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateField/DateField.component.js +++ b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateField/DateField.component.js @@ -2,7 +2,6 @@ import * as React from 'react'; import { withStyles, withTheme } from '@material-ui/core/styles'; import { DateField as UIDateField } from 'capture-ui'; -import { withCalendarProps } from '../../../HOC/withCalendarProps'; import { systemSettingsStore } from '../../../../../../metaDataMemoryStores'; const getStyles = (theme: Theme) => ({ @@ -44,4 +43,4 @@ class DateFieldPlain extends React.Component { } } -export const DateField = withTheme()(withCalendarProps()(withStyles(getStyles)(DateFieldPlain))); +export const DateField = withTheme()(withStyles(getStyles)(DateFieldPlain)); diff --git a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateRangeField/DateRangeField.component.js b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateRangeField/DateRangeField.component.js index ac892e4aae..496d330d03 100644 --- a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateRangeField/DateRangeField.component.js +++ b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateRangeField/DateRangeField.component.js @@ -2,7 +2,6 @@ import * as React from 'react'; import { withStyles, withTheme } from '@material-ui/core/styles'; import { DateRangeField as UIDateRangeField } from 'capture-ui'; -import { withCalendarProps } from '../../../HOC/withCalendarProps'; const getStyles = (theme: Theme) => ({ innerInputError: { @@ -49,4 +48,4 @@ const DateRangeFieldPlain = (props: Props) => { ); }; -export const DateRangeField = withTheme()(withCalendarProps()(withStyles(getStyles)(DateRangeFieldPlain))); +export const DateRangeField = withTheme()(withStyles(getStyles)(DateRangeFieldPlain)); diff --git a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeField/DateTimeField.component.js b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeField/DateTimeField.component.js index 64590c2413..a8d7a72d82 100644 --- a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeField/DateTimeField.component.js +++ b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeField/DateTimeField.component.js @@ -2,7 +2,6 @@ import * as React from 'react'; import { withStyles, withTheme } from '@material-ui/core/styles'; import { DateTimeField as UIDateTimeField } from 'capture-ui'; -import { withCalendarProps } from '../../../HOC/withCalendarProps'; const getStyles = (theme: Theme) => ({ innerInputError: { @@ -42,4 +41,4 @@ class DateTimeFieldPlain extends React.Component { } } -export const DateTimeField = withTheme()(withCalendarProps()(withStyles(getStyles)(DateTimeFieldPlain))); +export const DateTimeField = withTheme()(withStyles(getStyles)(DateTimeFieldPlain)); diff --git a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeRangeField/DateTimeRangeField.component.js b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeRangeField/DateTimeRangeField.component.js index c65b6fffd0..852b33525f 100644 --- a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeRangeField/DateTimeRangeField.component.js +++ b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/DateTimeRangeField/DateTimeRangeField.component.js @@ -2,7 +2,6 @@ import * as React from 'react'; import { withStyles, withTheme } from '@material-ui/core/styles'; import { DateTimeRangeField as UIDateTimeRangeField } from 'capture-ui'; -import { withCalendarProps } from '../../../HOC/withCalendarProps'; const getStyles = (theme: Theme) => ({ innerInputError: { @@ -42,4 +41,4 @@ class DateTimeRangeFieldPlain extends React.Component { } } -export const DateTimeRangeField = withTheme()(withCalendarProps()(withStyles(getStyles)(DateTimeRangeFieldPlain))); +export const DateTimeRangeField = withTheme()(withStyles(getStyles)(DateTimeRangeFieldPlain)); diff --git a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/getCalendarTheme.js b/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/getCalendarTheme.js deleted file mode 100644 index ba5ee04cbb..0000000000 --- a/src/core_modules/capture-core/components/FormFields/New/Fields/DateAndTimeFields/getCalendarTheme.js +++ /dev/null @@ -1,14 +0,0 @@ -// @flow - -export const getCalendarTheme = (theme: Theme) => ({ - accentColor: theme.palette.secondary.main, - floatingNav: { - background: 'rgba(0, 30, 64, 0.8)', - chevron: 'rgb(145, 203, 193)', - color: 'white', - }, - headerColor: theme.palette.primary.main, - todayColor: theme.palette.secondary.main, - selectionColor: theme.palette.primary.main, - weekdayColor: theme.palette.primary.main, -}); diff --git a/src/core_modules/capture-core/components/FormFields/New/HOC/messages/withDisplayMessages.js b/src/core_modules/capture-core/components/FormFields/New/HOC/messages/withDisplayMessages.js index 3aedaa7379..2760ecf654 100644 --- a/src/core_modules/capture-core/components/FormFields/New/HOC/messages/withDisplayMessages.js +++ b/src/core_modules/capture-core/components/FormFields/New/HOC/messages/withDisplayMessages.js @@ -160,7 +160,6 @@ const getDisplayMessagesHOC = (InnerComponent: React.ComponentType) => validatingMessage, ...passOnProps } = this.props; - const messages = this.getMessage(errorMessage, warningMessage, infoMessage, validatingMessage); diff --git a/src/core_modules/capture-core/components/FormFields/New/HOC/withCalendarProps.js b/src/core_modules/capture-core/components/FormFields/New/HOC/withCalendarProps.js deleted file mode 100644 index 54480957dd..0000000000 --- a/src/core_modules/capture-core/components/FormFields/New/HOC/withCalendarProps.js +++ /dev/null @@ -1,69 +0,0 @@ -// @flow -import * as React from 'react'; -import { capitalizeFirstLetter } from 'capture-core-utils/string'; -import { parseDate, convertDateObjectToDateFormatString } from '../../../../utils/converters/date'; -import { getCalendarTheme } from '../Fields/DateAndTimeFields/getCalendarTheme'; -import { CurrentLocaleData } from '../../../../utils/localeData/CurrentLocaleData'; - -type Props = { - theme: Object, - calendarWidth?: ?number, - width: number, -} - -export const withCalendarProps = () => (InnerComponent: React.ComponentType) => - class CalendarPropsHOC extends React.Component { - static convertValueIntoCalendar(inputValue: ?string) { - if (!inputValue) { - return new Date(); - } - - const parseData = parseDate(inputValue); - if (!parseData.isValid) { - return new Date(); - } - - // $FlowFixMe[incompatible-use] automated comment - return parseData.momentDate.toDate(); - } - - static convertValueOutFromCalendar(changeDate: Date) { - return convertDateObjectToDateFormatString(changeDate); - } - - calendarTheme: Object; - calendarLocaleData: Object; - constructor(props: Props) { - super(props); - this.calendarTheme = getCalendarTheme(this.props.theme); - const projectLocaleData = CurrentLocaleData.get(); - const calculatedCalendarWidth = this.props.calendarWidth || this.props.width; - this.calendarLocaleData = { - locale: projectLocaleData.dateFnsLocale, - headerFormat: calculatedCalendarWidth >= 400 ? - projectLocaleData.calendarFormatHeaderLong : - projectLocaleData.calendarFormatHeaderShort, - weekdays: projectLocaleData.weekDaysShort.map(day => capitalizeFirstLetter(day)), - blank: projectLocaleData.selectDatesText, - todayLabel: { - long: projectLocaleData.todayLabelLong, - short: projectLocaleData.todayLabelShort, - }, - weekStartsOn: projectLocaleData.weekStartsOn, - }; - } - - render() { - const { theme, ...passOnProps } = this.props; - return ( - // $FlowFixMe - - ); - } - }; diff --git a/src/core_modules/capture-core/components/ListView/Filters/FilterButton/buttonTextBuilder/converters/dateConverter.js b/src/core_modules/capture-core/components/ListView/Filters/FilterButton/buttonTextBuilder/converters/dateConverter.js index 3ff9d3289b..4dce8ba7a9 100644 --- a/src/core_modules/capture-core/components/ListView/Filters/FilterButton/buttonTextBuilder/converters/dateConverter.js +++ b/src/core_modules/capture-core/components/ListView/Filters/FilterButton/buttonTextBuilder/converters/dateConverter.js @@ -4,7 +4,8 @@ import { pipe } from 'capture-core-utils'; import moment from 'moment'; import { convertMomentToDateFormatString } from '../../../../../../utils/converters/date'; import type { DateFilterData, AbsoluteDateFilterData } from '../../../../../FiltersForTypes'; -import { areRelativeRangeValuesSupported } from '../../../../../../utils/validators/areRelativeRangeValuesSupported'; +import { areRelativeRangeValuesSupported } + from '../../../../../../utils/validation/validators/areRelativeRangeValuesSupported'; const periods = { TODAY: 'TODAY', diff --git a/src/core_modules/capture-core/components/UrlSync/withUrlSync.js b/src/core_modules/capture-core/components/UrlSync/withUrlSync.js index c452f2a92c..ecb9ed1599 100644 --- a/src/core_modules/capture-core/components/UrlSync/withUrlSync.js +++ b/src/core_modules/capture-core/components/UrlSync/withUrlSync.js @@ -3,7 +3,7 @@ * @namespace UrlSync */ import * as React from 'react'; -import { parse, type QueryParameters } from 'query-string'; +import queryString, { type QueryParameters } from 'query-string'; import { pageFetchesOrgUnitUsingTheOldWay } from '../../utils/url'; type Props = { @@ -96,7 +96,7 @@ const getUrlSyncer = ( isOutOfSync() { const syncSpecification = onGetSyncSpecification(this.props); const { history: { location }, statePage, urlPage } = this.props; - const locationParams = parse(location && location.search); + const locationParams = queryString.parse(location && location.search); const urlParamsAreOutOfSync = this.paramsNeedsUpdate(syncSpecification, locationParams); const urlPathnameIsOutOfSync = urlPage !== statePage; diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryRules.epics.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryRules.epics.js index 73e0160c03..f582f16368 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryRules.epics.js +++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryRules.epics.js @@ -1,6 +1,7 @@ // @flow import { ofType } from 'redux-observable'; -import { map } from 'rxjs/operators'; +import { map, switchMap } from 'rxjs/operators'; +import { from } from 'rxjs'; import { batchActions } from 'redux-batched-actions'; import type { OrgUnit } from '@dhis2/rules-engine-javascript'; import i18n from '@dhis2/d2-i18n'; @@ -15,22 +16,34 @@ import { getCurrentClientMainData, getApplicableRuleEffectsForTrackerProgram, updateRulesEffects, + validateAssignEffects, type FieldData, } from '../../../../rules'; import { getDataEntryKey } from '../../../DataEntry/common/getDataEntryKey'; import type { RulesExecutionDependenciesClientFormatted } from '../../common.types'; import { getLocationQuery } from '../../../../utils/routing'; +import type { QuerySingleResource } from '../../../../utils/api'; -const runRulesForNewEvent = ( +const runRulesForNewEvent = async ({ + store, + dataEntryId, + itemId, + uid, + orgUnit, + rulesExecutionDependenciesClientFormatted, + fieldData, + querySingleResource, +}: { store: ReduxStore, dataEntryId: string, itemId: string, uid: string, orgUnit: OrgUnit, - history: Object, - { events, attributeValues, enrollmentData }: RulesExecutionDependenciesClientFormatted, + rulesExecutionDependenciesClientFormatted: RulesExecutionDependenciesClientFormatted, fieldData?: ?FieldData, -) => { + querySingleResource: QuerySingleResource, +}) => { + const { events, attributeValues, enrollmentData } = rulesExecutionDependenciesClientFormatted; const state = store.value; const formId = getDataEntryKey(dataEntryId, itemId); const { programId, stageId } = getLocationQuery(); @@ -47,7 +60,7 @@ const runRulesForNewEvent = ( const currentEventMainData = getCurrentClientMainData(state, itemId, dataEntryId, foundation); const currentEvent = { ...currentEventValues, ...currentEventMainData, programStageId }; - const ruleEffects = getApplicableRuleEffectsForTrackerProgram({ + const effects = getApplicableRuleEffectsForTrackerProgram({ program, stage, orgUnit, @@ -57,40 +70,55 @@ const runRulesForNewEvent = ( enrollmentData, }); + const effectsWithValidations = await validateAssignEffects({ + dataElements: foundation.getElements(), + effects, + querySingleResource, + }); + return batchActions([ - updateRulesEffects(ruleEffects, formId), + updateRulesEffects(effectsWithValidations, formId), rulesExecutedPostUpdateField(dataEntryId, itemId, uid), ], newEventWidgetDataEntryBatchActionTypes.RULES_EFFECTS_ACTIONS_BATCH, ); }; -export const runRulesOnUpdateDataEntryFieldForNewEnrollmentEventEpic = (action$: InputObservable, store: ReduxStore, { history }: ApiUtils) => +export const runRulesOnUpdateDataEntryFieldForNewEnrollmentEventEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => action$.pipe( ofType(newEventWidgetDataEntryBatchActionTypes.UPDATE_DATA_ENTRY_FIELD_ADD_EVENT_ACTION_BATCH), map(actionBatch => actionBatch.payload .find(action => action.type === newEventWidgetDataEntryActionTypes.RULES_ON_UPDATE_EXECUTE)), - map((action) => { + switchMap((action) => { const { dataEntryId, itemId, uid, orgUnit, rulesExecutionDependenciesClientFormatted } = action.payload; - return runRulesForNewEvent( + const runRulesForNewEventPromise = runRulesForNewEvent({ store, dataEntryId, itemId, uid, orgUnit, - history, rulesExecutionDependenciesClientFormatted, - ); + querySingleResource, + }); + return from(runRulesForNewEventPromise); })); -export const runRulesOnUpdateFieldForNewEnrollmentEventEpic = (action$: InputObservable, store: ReduxStore, { history }: ApiUtils) => +export const runRulesOnUpdateFieldForNewEnrollmentEventEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => action$.pipe( ofType(newEventWidgetDataEntryBatchActionTypes.FIELD_UPDATE_BATCH), map(actionBatch => actionBatch.payload .find(action => action.type === newEventWidgetDataEntryActionTypes.RULES_ON_UPDATE_EXECUTE)), - map((action) => { + switchMap((action) => { const { dataEntryId, itemId, @@ -107,14 +135,16 @@ export const runRulesOnUpdateFieldForNewEnrollmentEventEpic = (action$: InputObs value, valid: uiState.valid, }; - return runRulesForNewEvent( + + const runRulesForNewEventPromise = runRulesForNewEvent({ store, dataEntryId, itemId, uid, orgUnit, - history, rulesExecutionDependenciesClientFormatted, fieldData, - ); + querySingleResource, + }); + return from(runRulesForNewEventPromise); })); diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js index 8bda3e79ef..046217b02a 100644 --- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js +++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js @@ -1,14 +1,14 @@ // @flow import { hasValue } from 'capture-core-utils/validators/form'; import i18n from '@dhis2/d2-i18n'; -import { isValidDate } from '../../../../utils/validators/form'; +import { isValidDate } from '../../../../utils/validation/validators/form'; -const preValidateDate = (value?: ?string) => { +const preValidateDate = (value?: ?string, internalComponentError?: ?{error: ?string, errorCode: ?string}) => { if (!value) { return true; } - return isValidDate(value); + return isValidDate(value, internalComponentError); }; export const getEventDateValidatorContainers = () => { diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js index 05515b4bcc..6ff85dc625 100644 --- a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js +++ b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/epics/editEventDataEntry.epics.js @@ -1,7 +1,8 @@ // @flow import i18n from '@dhis2/d2-i18n'; +import { from } from 'rxjs'; import { ofType } from 'redux-observable'; -import { map } from 'rxjs/operators'; +import { map, switchMap } from 'rxjs/operators'; import { batchActions } from 'redux-batched-actions'; import type { OrgUnit } from '@dhis2/rules-engine-javascript'; import { rulesExecutedPostUpdateField } from '../../../DataEntry/actions/dataEntry.actions'; @@ -16,6 +17,7 @@ import { getApplicableRuleEffectsForEventProgram, getApplicableRuleEffectsForTrackerProgram, updateRulesEffects, + validateAssignEffects, type FieldData, } from '../../../../rules'; import { getStageFromEvent } from '../../../../metaData/helpers/getStageFromEvent'; @@ -23,8 +25,9 @@ import { EventProgram, TrackerProgram } from '../../../../metaData/Program'; import { getDataEntryKey } from '../../../DataEntry/common/getDataEntryKey'; import { prepareEnrollmentEventsForRulesEngine } from '../../../../events/prepareEnrollmentEvents'; import { getEnrollmentForRulesEngine, getAttributeValuesForRulesEngine } from '../../helpers'; +import type { QuerySingleResource } from '../../../../utils/api'; -const runRulesForEditSingleEvent = ({ +const runRulesForEditSingleEvent = async ({ store, dataEntryId, itemId, @@ -32,6 +35,7 @@ const runRulesForEditSingleEvent = ({ orgUnit, fieldData, programId, + querySingleResource, }: { store: ReduxStore, dataEntryId: string, @@ -40,6 +44,7 @@ const runRulesForEditSingleEvent = ({ programId: string, orgUnit: OrgUnit, fieldData?: ?FieldData, + querySingleResource: QuerySingleResource }) => { const state = store.value; const formId = getDataEntryKey(dataEntryId, itemId); @@ -91,33 +96,56 @@ const runRulesForEditSingleEvent = ({ }); } + const effectsWithValidations = await validateAssignEffects({ + dataElements: foundation.getElements(), + effects, + querySingleResource, + }); + return batchActions([ - updateRulesEffects(effects, formId), + updateRulesEffects(effectsWithValidations, formId), rulesExecutedPostUpdateField(dataEntryId, itemId, uid), ], editEventDataEntryBatchActionTypes.RULES_EFFECTS_ACTIONS_BATCH); }; -export const runRulesOnUpdateDataEntryFieldForEditSingleEventEpic = (action$: InputObservable, store: ReduxStore) => +export const runRulesOnUpdateDataEntryFieldForEditSingleEventEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => // $FlowSuppress action$.pipe( ofType(editEventDataEntryBatchActionTypes.UPDATE_DATA_ENTRY_FIELD_EDIT_SINGLE_EVENT_ACTION_BATCH), map(actionBatch => actionBatch.payload.find(action => action.type === editEventDataEntryActionTypes.START_RUN_RULES_ON_UPDATE), ), - map((action) => { + switchMap((action) => { const { dataEntryId, itemId, uid, orgUnit, programId } = action.payload; - return runRulesForEditSingleEvent({ store, dataEntryId, itemId, uid, orgUnit, programId }); + const runRulesForEditSingleEventPromise = runRulesForEditSingleEvent({ + store, + dataEntryId, + itemId, + uid, + orgUnit, + programId, + querySingleResource, + }); + return from(runRulesForEditSingleEventPromise); })); -export const runRulesOnUpdateFieldForEditSingleEventEpic = (action$: InputObservable, store: ReduxStore) => +export const runRulesOnUpdateFieldForEditSingleEventEpic = ( + action$: InputObservable, + store: ReduxStore, + { querySingleResource }: ApiUtils, +) => // $FlowSuppress action$.pipe( ofType(editEventDataEntryBatchActionTypes.UPDATE_FIELD_EDIT_SINGLE_EVENT_ACTION_BATCH), map(actionBatch => actionBatch.payload.find(action => action.type === editEventDataEntryActionTypes.START_RUN_RULES_ON_UPDATE), ), - map((action) => { + switchMap((action) => { const { elementId, value, @@ -133,7 +161,7 @@ export const runRulesOnUpdateFieldForEditSingleEventEpic = (action$: InputObserv value, valid: uiState.valid, }; - return runRulesForEditSingleEvent({ + const runRulesForEditSingleEventPromise = runRulesForEditSingleEvent({ store, dataEntryId, itemId, @@ -141,6 +169,8 @@ export const runRulesOnUpdateFieldForEditSingleEventEpic = (action$: InputObserv orgUnit, fieldData, programId, + querySingleResource, }); + return from(runRulesForEditSingleEventPromise); })); diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js index 821d0c2752..c5117776e5 100644 --- a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js +++ b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/fieldValidators/eventDate.validatorContainersGetter.js @@ -1,14 +1,14 @@ // @flow -import { hasValue } from 'capture-core-utils/validators/form'; import i18n from '@dhis2/d2-i18n'; -import { isValidDate } from '../../../../utils/validators/form'; +import { hasValue } from 'capture-core-utils/validators/form'; +import { isValidDate } from '../../../../utils/validation/validators/form'; -const preValidateDate = (value?: ?string) => { +const preValidateDate = (value?: ?string, internalComponentError: ?{error?: ?string, errorCode?: ?string}) => { if (!value) { return true; } - return isValidDate(value); + return isValidDate(value, internalComponentError); }; export const getEventDateValidatorContainers = () => { diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js index 8b62978b24..ca3f806f2d 100644 --- a/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js +++ b/src/core_modules/capture-core/components/WidgetEventSchedule/ScheduleDate/ScheduleDate.component.js @@ -5,8 +5,6 @@ import withStyles from '@material-ui/core/styles/withStyles'; import { DateField } from 'capture-core/components/FormFields/New'; import { InfoBox } from '../InfoBox'; import type { Props } from './scheduleDate.types'; -import { convertStringToDateFormat } from '../../../utils/converters/date'; - const styles = { container: { @@ -36,7 +34,14 @@ const ScheduleDatePlain = ({ onSetFocus={() => {}} onFocus={() => { }} onRemoveFocus={() => { }} - onBlur={(e) => { setScheduleDate(convertStringToDateFormat(e)); }} + onBlur={(e, internalComponentError) => { + const { error } = internalComponentError; + if (error) { + setScheduleDate(''); + return; + } + setScheduleDate(e); + }} /> } { const dataEntryId = 'trackedEntityProfile'; const itemId = 'edit'; + const dataEngine = useDataEngine(); + const querySingleResource = makeQuerySingleResource(dataEngine.query.bind(dataEngine)); const dispatch = useDispatch(); const [saveAttempted, setSaveAttempted] = useState(false); + const onGetValidationContext = useCallback( + () => ({ + programId: programAPI.id, + orgUnitId, + trackedEntityInstanceId, + trackedEntityTypeId: programAPI.trackedEntityType.id, + }), + [programAPI, orgUnitId, trackedEntityInstanceId], + ); + const context = useLifecycle({ programAPI, orgUnitId, @@ -41,8 +58,19 @@ export const DataEntry = ({ const { formValidated, errorsMessages, warningsMessages } = useFormValidations(dataEntryId, itemId, saveAttempted); const onUpdateFormField = useCallback( - (...args: Array) => dispatch(getUpdateFieldActions(context, ...args)), - [dispatch, context], + (innerAction: ReduxAction) => { + const uid = uuid(); + onDisable(); + dispatch(startRunRulesPostUpdateField(dataEntryId, itemId, uid)); + + getUpdateFieldActions({ context, querySingleResource, onGetValidationContext, innerAction, uid }).then( + (actions) => { + onEnable(); + return dispatch(actions); + }, + ); + }, + [dispatch, querySingleResource, context, onGetValidationContext, onDisable, onEnable], ); const onUpdateFormFieldAsync = useCallback( (innerAction: ReduxAction) => { @@ -50,15 +78,6 @@ export const DataEntry = ({ }, [dispatch], ); - const getValidationContext = useCallback( - () => ({ - programId: programAPI.id, - orgUnitId, - trackedEntityInstanceId, - trackedEntityTypeId: programAPI.trackedEntityType.id, - }), - [programAPI, orgUnitId, trackedEntityInstanceId], - ); const onSave = useCallback(() => { setSaveAttempted(true); @@ -107,7 +126,7 @@ export const DataEntry = ({ onUpdateFormField={onUpdateFormField} onUpdateFormFieldAsync={onUpdateFormFieldAsync} modalState={modalState} - onGetValidationContext={getValidationContext} + onGetValidationContext={onGetValidationContext} errorsMessages={errorsMessages} warningsMessages={warningsMessages} orgUnit={{ id: orgUnitId }} diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/getRulesActionsForTEI.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/getRulesActionsForTEI.js index 74aa721f08..03c2aff309 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/getRulesActionsForTEI.js +++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/getRulesActionsForTEI.js @@ -12,7 +12,13 @@ import type { } from '@dhis2/rules-engine-javascript'; import { rulesEngine } from '../../../../rules/rulesEngine'; import type { RenderFoundation } from '../../../../metaData'; -import { updateRulesEffects, postProcessRulesEffects, buildEffectsHierarchy } from '../../../../rules'; +import { + updateRulesEffects, + postProcessRulesEffects, + buildEffectsHierarchy, + validateAssignEffects, +} from '../../../../rules'; +import type { QuerySingleResource } from '../../../../utils/api'; const getEnrollmentForRulesExecution = enrollment => enrollment && { @@ -36,12 +42,48 @@ const getDataElementsForRulesExecution = (dataElements: ?DataElements) => {}, ); -const getRulesActions = (rulesEffects: OutputEffects, foundation: RenderFoundation, formId: string) => { - const effectsHierarchy = buildEffectsHierarchy(postProcessRulesEffects(rulesEffects, foundation)); - return [updateRulesEffects(effectsHierarchy, formId)]; +export const getRulesActionsForTEI = ({ + foundation, + formId, + orgUnit, + enrollmentData, + teiValues, + trackedEntityAttributes, + optionSets, + rulesContainer, + otherEvents, + dataElements, + userRoles, +}: { + foundation: RenderFoundation, + formId: string, + orgUnit: OrgUnit, + enrollmentData?: ?Enrollment, + teiValues?: ?TEIValues, + trackedEntityAttributes: ?TrackedEntityAttributes, + optionSets: OptionSets, + rulesContainer: ProgramRulesContainer, + otherEvents?: ?EventsData, + dataElements: ?DataElements, + userRoles: Array, +}) => { + const effects: OutputEffects = rulesEngine.getProgramRuleEffects({ + programRulesContainer: rulesContainer, + currentEvent: null, + otherEvents, + dataElements: getDataElementsForRulesExecution(dataElements), + trackedEntityAttributes, + selectedEnrollment: getEnrollmentForRulesExecution(enrollmentData), + selectedEntity: teiValues, + selectedOrgUnit: orgUnit, + selectedUserRoles: userRoles, + optionSets, + }); + const effectsHierarchy = buildEffectsHierarchy(postProcessRulesEffects(effects, foundation)); + return updateRulesEffects(effectsHierarchy, formId); }; -export const getRulesActionsForTEI = ({ +export const getRulesActionsForTEIAsync = async ({ foundation, formId, orgUnit, @@ -53,6 +95,8 @@ export const getRulesActionsForTEI = ({ otherEvents, dataElements, userRoles, + querySingleResource, + onGetValidationContext, }: { foundation: RenderFoundation, formId: string, @@ -65,6 +109,8 @@ export const getRulesActionsForTEI = ({ otherEvents?: ?EventsData, dataElements: ?DataElements, userRoles: Array, + querySingleResource: QuerySingleResource, + onGetValidationContext: () => Object, }) => { const effects: OutputEffects = rulesEngine.getProgramRuleEffects({ programRulesContainer: rulesContainer, @@ -78,5 +124,12 @@ export const getRulesActionsForTEI = ({ selectedUserRoles: userRoles, optionSets, }); - return getRulesActions(effects, foundation, formId); + const effectsHierarchy = buildEffectsHierarchy(postProcessRulesEffects(effects, foundation)); + const effectsWithValidations = await validateAssignEffects({ + dataElements: foundation.getElements(), + effects: effectsHierarchy, + querySingleResource, + onGetValidationContext, + }); + return updateRulesEffects(effectsWithValidations, formId); }; diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/index.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/index.js index a088da2ddb..494f821921 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/index.js +++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/ProgramRules/index.js @@ -1,3 +1,3 @@ // @flow export { buildRulesContainer } from './rulesContainer'; -export { getRulesActionsForTEI } from './getRulesActionsForTEI'; +export { getRulesActionsForTEI, getRulesActionsForTEIAsync } from './getRulesActionsForTEI'; diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.actions.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.actions.js index 331f6e1a4d..f326ab200c 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.actions.js +++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.actions.js @@ -1,5 +1,4 @@ // @flow -import { v4 as uuid } from 'uuid'; import { batchActions } from 'redux-batched-actions'; import type { OrgUnit, @@ -18,10 +17,10 @@ import type { FieldData } from '../../../rules'; import { getCurrentClientValues } from '../../../rules'; import { loadNewDataEntry } from '../../DataEntry/actions/dataEntryLoadNew.actions'; import { rulesExecutedPostUpdateField } from '../../DataEntry/actions/dataEntry.actions'; -import { startRunRulesPostUpdateField } from '../../DataEntry'; -import { getRulesActionsForTEI } from './ProgramRules'; +import { getRulesActionsForTEIAsync } from './ProgramRules'; import { addFormData } from '../../D2Form/actions/form.actions'; import type { Geometry } from './helpers/types'; +import type { QuerySingleResource } from '../../../utils/api'; export const TEI_MODAL_STATE = { OPEN: 'Open', @@ -65,8 +64,19 @@ type Context = { state: ReduxState, }; -export const getUpdateFieldActions = (context: Context, innerAction: ReduxAction) => { - const uid = uuid(); +export const getUpdateFieldActions = async ({ + context, + querySingleResource, + onGetValidationContext, + innerAction, + uid, +}: { + context: Context, + querySingleResource: QuerySingleResource, + onGetValidationContext: () => Object, + innerAction: ReduxAction, + uid: string +}) => { const { orgUnit, trackedEntityAttributes, @@ -87,7 +97,7 @@ export const getUpdateFieldActions = (context: Context, innerAction: ReduxAction }; const formId = `${dataEntryId}-${itemId}`; const currentTEIValues = getCurrentClientValues(state, formFoundation, formId, fieldData); - const rulesActions = getRulesActionsForTEI({ + const rulesActions = await getRulesActionsForTEIAsync({ foundation: formFoundation, formId, orgUnit, @@ -99,14 +109,15 @@ export const getUpdateFieldActions = (context: Context, innerAction: ReduxAction otherEvents, dataElements, userRoles, + querySingleResource, + onGetValidationContext, }); return batchActions( [ innerAction, - ...rulesActions, + rulesActions, rulesExecutedPostUpdateField(dataEntryId, itemId, uid), - startRunRulesPostUpdateField(dataEntryId, itemId, uid), ], dataEntryActionTypes.UPDATE_FIELD_PROFILE_ACTION_BATCH, ); diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.types.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.types.js index ddb4f533c9..a5a7ef9c4c 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.types.js +++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/dataEntry.types.js @@ -13,7 +13,7 @@ export type PlainProps = {| formFoundation: any, onCancel: () => void, onSave: () => void, - onUpdateFormField: () => void, + onUpdateFormField: (innerAction: ReduxAction) => void, onUpdateFormFieldAsync: (innerAction: ReduxAction) => void, onGetValidationContext: () => Object, modalState: string, @@ -29,6 +29,7 @@ export type Props = {| dataEntryFormConfig: ?DataEntryFormConfig, onCancel: () => void, onDisable: () => void, + onEnable: () => void, clientAttributesWithSubvalues: Array, trackedEntityInstanceId: string, onSaveSuccessActionType?: string, diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useLifecycle.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useLifecycle.js index 0847eda23d..16a8ff9cea 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useLifecycle.js +++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/hooks/useLifecycle.js @@ -89,7 +89,7 @@ export const useLifecycle = ({ Object.entries(rulesContainer).length > 0 ) { dispatch( - ...getRulesActionsForTEI({ + getRulesActionsForTEI({ foundation: formFoundation, formId: `${dataEntryId}-${itemId}`, orgUnit, diff --git a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js index f63800dd43..c94ed1cdb6 100644 --- a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js +++ b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js @@ -140,6 +140,8 @@ const WidgetProfilePlain = ({ ); }; + const handleOnDisable = useCallback(() => setTeiModalState(TEI_MODAL_STATE.OPEN_DISABLE), [setTeiModalState]); + const handleOnEnable = useCallback(() => setTeiModalState(TEI_MODAL_STATE.OPEN), [setTeiModalState]); return (
@@ -179,7 +181,8 @@ const WidgetProfilePlain = ({ <> setTeiModalState(TEI_MODAL_STATE.CLOSE)} - onDisable={() => setTeiModalState(TEI_MODAL_STATE.OPEN_DISABLE)} + onDisable={handleOnDisable} + onEnable={handleOnEnable} programAPI={program} dataEntryFormConfig={dataEntryFormConfig} orgUnitId={orgUnitId} diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js index d605f177cc..cbb55a1ef5 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js @@ -1,6 +1,5 @@ // @flow import React, { useState } from 'react'; -import { convertStringToDateFormat } from '../../../utils/converters/date'; import { DateField, withDefaultFieldContainer, @@ -16,7 +15,7 @@ import type { RelatedStageDataValueStates } from '../WidgetRelatedStages.types'; type Props = {| scheduledLabel: string, relatedStagesDataValues: RelatedStageDataValueStates, - onBlurDateField: (value: string) => void, + onBlurDateField: (value: string, internalComponentError?: {error: ?string, errorCode: ?string}) => void, saveAttempted: boolean, errorMessages: ErrorMessagesForRelatedStages, |} @@ -43,16 +42,16 @@ export const DateFieldForRelatedStages = ({ }: Props) => { const [touched, setTouched] = useState(false); - const onBlur = (event) => { + const onBlur = (event, internalComponentError) => { setTouched(true); - onBlurDateField(event); + onBlurDateField(event, internalComponentError); }; const shouldShowError = (touched || saveAttempted); return ( {}} onFocus={() => {}} diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.component.js b/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.component.js index 33c556f0ed..310e5f7100 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.component.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.component.js @@ -3,7 +3,6 @@ import React from 'react'; import type { ComponentType } from 'react'; import { withStyles } from '@material-ui/core'; import { colors, spacers, spacersNum } from '@dhis2/ui'; -import { convertStringToDateFormat } from '../../../utils/converters/date'; import { DateFieldForRelatedStages, OrgUnitSelectorForRelatedStages } from '../FormComponents'; import type { ErrorMessagesForRelatedStages } from '../RelatedStagesActions'; import type { RelatedStageDataValueStates } from '../WidgetRelatedStages.types'; @@ -52,10 +51,11 @@ export const ScheduleInOrgUnitPlain = ({ scheduledLabel, classes, }: Props) => { - const onBlurDateField = (e) => { + const onBlurDateField = (e, internalComponentError) => { setRelatedStagesDataValues(prevValues => ({ ...prevValues, - scheduledAt: convertStringToDateFormat(e), + scheduledAt: e, + scheduledAtFormatError: internalComponentError, })); }; diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js index 31460917ac..9ce0628481 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js @@ -33,6 +33,7 @@ const WidgetRelatedStagesPlain = ({ const [relatedStageDataValues, setRelatedStageDataValues] = useState({ linkMode: undefined, scheduledAt: '', + scheduledAtFormatError: undefined, orgUnit: undefined, linkedEventId: undefined, }); @@ -61,10 +62,11 @@ const WidgetRelatedStagesPlain = ({ }; const formIsValid = useCallback(() => { - const { scheduledAt, orgUnit, linkedEventId, linkMode } = relatedStageDataValues; + const { scheduledAt, scheduledAtFormatError, orgUnit, linkedEventId, linkMode } = relatedStageDataValues; return relatedStageWidgetIsValid({ linkMode, scheduledAt, + scheduledAtFormatError, orgUnit, linkedEventId, setErrorMessages: addErrorMessage, diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js index bb00b94c33..c433e40c89 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js @@ -30,6 +30,7 @@ export type Props = {| export type RelatedStageDataValueStates = {| linkMode: ?$Keys, scheduledAt: string, + scheduledAtFormatError: ?{error: ?string, errorCode: ?string}, orgUnit: ?{ path: string, id: string, diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js index b02e1f5ae5..219e354ded 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js @@ -1,29 +1,36 @@ // @flow import i18n from '@dhis2/d2-i18n'; -import { systemSettingsStore } from '../../../metaDataMemoryStores'; -import { isValidDate, isValidOrgUnit } from '../../../../capture-core-utils/validators/form'; +import { isValidOrgUnit } from '../../../../capture-core-utils/validators/form'; +import { isValidDate } from '../../../utils/validation/validators/form'; import { actions as RelatedStageModes } from '../constants'; type Props = { scheduledAt: ?string, + scheduledAtFormatError: ?{error: ?string, errorCode: ?string}, orgUnit: ?Object, linkedEventId: ?string, setErrorMessages: (messages: Object) => void, }; -export const isScheduledDateValid = (scheduledDate: string) => { - const dateFormat = systemSettingsStore.get().dateFormat; - return isValidDate(scheduledDate, dateFormat); +export const isScheduledDateValid = (scheduledDate: ?string, scheduledAtFormatError: ?{error: ?string, errorCode: ?string}) => { + if (!scheduledDate) { + return { valid: false, errorMessage: i18n.t('Please enter a date') }; + } + const { valid, errorMessage } = isValidDate(scheduledDate, scheduledAtFormatError); + return { + valid, + errorMessage, + }; }; const scheduleInOrgUnit = (props) => { - const { scheduledAt, orgUnit, setErrorMessages } = props ?? {}; - const scheduledAtIsValid = !!scheduledAt && isScheduledDateValid(scheduledAt); + const { scheduledAt, scheduledAtFormatError, orgUnit, setErrorMessages } = props ?? {}; + const { valid: scheduledAtIsValid, errorMessage } = isScheduledDateValid(scheduledAt, scheduledAtFormatError); const orgUnitIsValid = isValidOrgUnit(orgUnit); if (!scheduledAtIsValid) { setErrorMessages({ - scheduledAt: i18n.t('Please provide a valid date'), + scheduledAt: errorMessage, }); } else { setErrorMessages({ diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js index 21e7693f2f..f9f63ac48c 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js @@ -8,6 +8,7 @@ import { ValidationFunctionsByLinkMode } from './ValidationFunctions'; export const relatedStageWidgetIsValid = ({ linkMode, scheduledAt, + scheduledAtFormatError, orgUnit, linkedEventId, setErrorMessages, @@ -25,6 +26,7 @@ export const relatedStageWidgetIsValid = ({ return validationFunction({ scheduledAt, + scheduledAtFormatError, orgUnit, linkedEventId, setErrorMessages, diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js index f3521b8cc5..a8211930b7 100644 --- a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js +++ b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js @@ -5,6 +5,7 @@ import { RelatedStageModes } from '../index'; export type RelatedStageIsValidProps = {| linkMode: ?$Keys, scheduledAt: ?string, + scheduledAtFormatError: ?{error: ?string, errorCode: ?string}, orgUnit: ?{ id: string, name: string, diff --git a/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/helpers/eventFilters/apiEventFilterToClientConfigConverter/convertToClientConfig.js b/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/helpers/eventFilters/apiEventFilterToClientConfigConverter/convertToClientConfig.js index 42bdd39aee..d34d81ab1e 100644 --- a/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/helpers/eventFilters/apiEventFilterToClientConfigConverter/convertToClientConfig.js +++ b/src/core_modules/capture-core/components/WorkingLists/EventWorkingLists/helpers/eventFilters/apiEventFilterToClientConfigConverter/convertToClientConfig.js @@ -26,7 +26,8 @@ import type { ColumnsMetaForDataFetching, ClientConfig, } from '../../../types'; -import { areRelativeRangeValuesSupported } from '../../../../../../utils/validators/areRelativeRangeValuesSupported'; +import { areRelativeRangeValuesSupported } + from '../../../../../../utils/validation/validators/areRelativeRangeValuesSupported'; const getTextFilter = (filter: ApiDataFilterText): TextFilterData => { const value = filter.like; diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertToClientFilters.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertToClientFilters.js index 6730b1eba4..33863ea4f5 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertToClientFilters.js +++ b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/helpers/TEIFilters/apiTEIFilterToClientConfigConverter/convertToClientFilters.js @@ -19,7 +19,8 @@ import type { ApiTrackerQueryCriteria, TeiColumnsMetaForDataFetching, } from '../../../types'; -import { areRelativeRangeValuesSupported } from '../../../../../../utils/validators/areRelativeRangeValuesSupported'; +import { areRelativeRangeValuesSupported } + from '../../../../../../utils/validation/validators/areRelativeRangeValuesSupported'; import { DATE_TYPES, ASSIGNEE_MODES, MAIN_FILTERS } from '../../../constants'; import { ADDITIONAL_FILTERS } from '../../../helpers'; diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/dateConverter.js b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/dateConverter.js index c5c59e7675..4930ba75bb 100644 --- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/dateConverter.js +++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/dateConverter.js @@ -8,7 +8,8 @@ import type { RelativeDateFilterData, AbsoluteDateFilterData, } from '../../../../../ListView'; -import { areRelativeRangeValuesSupported } from '../../../../../../utils/validators/areRelativeRangeValuesSupported'; +import { areRelativeRangeValuesSupported } + from '../../../../../../utils/validation/validators/areRelativeRangeValuesSupported'; const periods = { TODAY: 'TODAY', diff --git a/src/core_modules/capture-core/converters/formToClient.js b/src/core_modules/capture-core/converters/formToClient.js index adca6b5b72..61c286d4d2 100644 --- a/src/core_modules/capture-core/converters/formToClient.js +++ b/src/core_modules/capture-core/converters/formToClient.js @@ -24,8 +24,8 @@ function convertDateTime(formValue: DateTimeValue): ?string { const hours = momentTime.hour(); const minutes = momentTime.minute(); - const parsedDate = parseDate(editedDate); - if (!parsedDate.isValid) return null; + const parsedDate = editedDate ? parseDate(editedDate) : null; + if (!(parsedDate && parsedDate.isValid)) return null; // $FlowFixMe[incompatible-type] automated comment const momentDateTime: moment$Moment = parsedDate.momentDate; momentDateTime.hour(hours); diff --git a/src/core_modules/capture-core/reducers/descriptions/form.reducerDescription.js b/src/core_modules/capture-core/reducers/descriptions/form.reducerDescription.js index 30dd29a15f..bed2120f6e 100644 --- a/src/core_modules/capture-core/reducers/descriptions/form.reducerDescription.js +++ b/src/core_modules/capture-core/reducers/descriptions/form.reducerDescription.js @@ -1,6 +1,6 @@ // @flow import { effectActions } from '@dhis2/rules-engine-javascript'; -import type { AssignOutputEffect } from '@dhis2/rules-engine-javascript'; +import type { AssignOutputEffectWithValidations } from '../../rules'; import { createReducerDescription } from '../../trackerRedux'; import { asyncHandlerActionTypes } from '../../components/D2Form'; import { actionTypes as fieldActionTypes } from '../../components/D2Form/D2SectionFields.actions'; @@ -63,7 +63,7 @@ export const formsValuesDesc = createReducerDescription({ return newState; }, [rulesEffectsActionTypes.UPDATE_RULES_EFFECTS]: (state, action) => { - const assignEffects: { [id: string]: Array } = + const assignEffects: { [id: string]: Array } = action.payload.rulesEffects && action.payload.rulesEffects[effectActions.ASSIGN_VALUE]; if (!assignEffects) { return state; @@ -76,7 +76,7 @@ export const formsValuesDesc = createReducerDescription({ ...state[payload.formId], ...Object.keys(assignEffects).reduce((acc, id) => { const effectsForId = assignEffects[id]; - const value = effectsForId[effectsForId.length - 1].value; + const value = effectsForId[0].value; acc[id] = value; return acc; }, {}), @@ -206,24 +206,29 @@ export const formsSectionsFieldsUIDesc = createReducerDescription({ [rulesEffectsActionTypes.UPDATE_RULES_EFFECTS]: (state, action) => { const { formId, rulesEffects } = action.payload; const formSectionFields = state[formId]; - const assignEffects: { [id: string]: Array } = + const assignEffects: { [id: string]: Array } = rulesEffects && rulesEffects[effectActions.ASSIGN_VALUE]; - if (!assignEffects || !formSectionFields) { + if (!assignEffects) { return state; } const updatedFields = Object.keys(assignEffects).reduce((acc, id) => { - if (formSectionFields[id]) { + const effect = assignEffects[id][0]; + const isEffectWithValidations = effect.hasOwnProperty('valid'); + if (formSectionFields?.[id] && isEffectWithValidations) { acc[id] = { - valid: true, - errorData: undefined, - errorMessage: undefined, - errorType: undefined, - modified: true, + valid: effect.valid, + errorData: effect.errorData, + errorMessage: effect.errorMessage, + errorType: effect.errorType, touched: true, validatingMessage: null, }; + } else { + acc[id] = { + touched: true, + }; } return acc; }, {}); diff --git a/src/core_modules/capture-core/rules/index.js b/src/core_modules/capture-core/rules/index.js index 7eedf9ff6d..96467328c2 100644 --- a/src/core_modules/capture-core/rules/index.js +++ b/src/core_modules/capture-core/rules/index.js @@ -10,3 +10,5 @@ export type { FieldData } from './inputHelpers'; export { postProcessRulesEffects } from './postProcessRulesEffects'; export { buildEffectsHierarchy } from './buildEffectsHierarchy'; export { filterApplicableRuleEffects } from './filterApplicableRuleEffects'; +export { validateAssignEffects } from './validateAssignEffects'; +export type { AssignOutputEffectWithValidations } from './validateAssignEffects'; diff --git a/src/core_modules/capture-core/rules/validateAssignEffects.js b/src/core_modules/capture-core/rules/validateAssignEffects.js new file mode 100644 index 0000000000..62f71694d7 --- /dev/null +++ b/src/core_modules/capture-core/rules/validateAssignEffects.js @@ -0,0 +1,63 @@ +// @flow +import { errorCreator } from 'capture-core-utils'; +import { effectActions } from '@dhis2/rules-engine-javascript'; +import log from 'loglevel'; +import type { AssignOutputEffect } from '@dhis2/rules-engine-javascript'; +import { type DataElement } from '../metaData'; +import type { QuerySingleResource } from '../utils/api'; +import { getValidators } from '../utils/validation/getValidators'; +import type { Validations } from '../utils/validation/validateValue'; +import { validateValue } from '../utils/validation/validateValue'; + +export type AssignOutputEffectWithValidations = { + [metaDataId: string]: Array, +}; + +export const validateAssignEffects = async ({ + dataElements, + effects, + querySingleResource, + onGetValidationContext, +}: { + dataElements: Array, + effects: Object, + querySingleResource: QuerySingleResource, + onGetValidationContext?: () => Object, +}): Promise => { + const assignEffects: {| [metaDataId: string]: Array |} = effects[effectActions.ASSIGN_VALUE]; + if (!assignEffects) { + return effects; + } + + const assignEffectsWithValidations = await dataElements.reduce(async (passPromise, metaData: DataElement) => { + const acc = await passPromise; + if (!assignEffects[metaData.id]) { + return acc; + } + + const effectsForId = assignEffects[metaData.id]; + const lastIndex = effectsForId.length - 1; + const value = effectsForId[lastIndex].value; + const validators = getValidators(metaData, querySingleResource); + const validationContext = onGetValidationContext && onGetValidationContext(); + + try { + const validatorResult = await validateValue({ validators, value, validationContext }); + const effectWithValidation = Object.assign({}, effectsForId[lastIndex], validatorResult); + + acc[metaData.id] = [effectWithValidation]; + return acc; + } catch (error) { + log.error( + errorCreator('an error occured while validating the assigned program rule effect')({ + metaData, + lastIndex, + error, + }), + ); + return acc; + } + }, Promise.resolve({})); + + return { ...effects, [effectActions.ASSIGN_VALUE]: assignEffectsWithValidations }; +}; diff --git a/src/core_modules/capture-core/components/D2Form/field/validators/constants/index.js b/src/core_modules/capture-core/utils/validation/constants/index.js similarity index 100% rename from src/core_modules/capture-core/components/D2Form/field/validators/constants/index.js rename to src/core_modules/capture-core/utils/validation/constants/index.js diff --git a/src/core_modules/capture-core/components/D2Form/field/validators/constants/validatorTypes.const.js b/src/core_modules/capture-core/utils/validation/constants/validatorTypes.const.js similarity index 100% rename from src/core_modules/capture-core/components/D2Form/field/validators/constants/validatorTypes.const.js rename to src/core_modules/capture-core/utils/validation/constants/validatorTypes.const.js diff --git a/src/core_modules/capture-core/components/D2Form/field/validators/getValidators.js b/src/core_modules/capture-core/utils/validation/getValidators.js similarity index 91% rename from src/core_modules/capture-core/components/D2Form/field/validators/getValidators.js rename to src/core_modules/capture-core/utils/validation/getValidators.js index be3c6b8e16..7f65ac02c1 100644 --- a/src/core_modules/capture-core/components/D2Form/field/validators/getValidators.js +++ b/src/core_modules/capture-core/utils/validation/getValidators.js @@ -25,16 +25,23 @@ import { getDateRangeValidator, getDateTimeRangeValidator, getTimeRangeValidator, -} from '../../../../utils/validators/form'; -import { dataElementTypes, type DateDataElement, type DataElement } from '../../../../metaData'; +} from './validators/form'; +import { dataElementTypes, type DateDataElement, type DataElement } from '../../metaData'; import { validatorTypes } from './constants'; -import type { QuerySingleResource } from '../../../../utils/api/api.types'; +import type { QuerySingleResource } from '../../utils/api/api.types'; -type Validator = (value: any) => Promise | boolean | { valid: boolean, errorMessage?: any}; +type Validator = ( + value: any, + validationContext: ?Object, + internalError?: ?{ + error?: ?string, + errorCode?: ?string, + } +) => Promise | boolean | { valid: boolean, errorMessage?: any, data?: any }; export type ValidatorContainer = { validator: Validator, - message: string, + message: string | Object, type?: string, validatingMessage?: string, } @@ -118,7 +125,7 @@ const validatorsForTypes = { type: validatorTypes.TYPE_BASE, }, { - validator: (value: string, allowFutureDate) => (allowFutureDate ? true : isValidNonFutureDate(value)), + validator: isValidNonFutureDate, type: validatorTypes.TYPE_EXTENDED, message: errorMessages.DATE_FUTURE_NOT_ALLOWED, }], @@ -205,28 +212,28 @@ const validatorsForTypes = { }], }; -function buildTypeValidators(metaData: DataElement | DateDataElement): ?Array { +function buildTypeValidators(metaData: DataElement | DateDataElement): Array { // $FlowFixMe dataElementTypes flow error let validatorContainersForType = validatorsForTypes[metaData.type] ? validatorsForTypes[metaData.type] : []; validatorContainersForType = validatorContainersForType.map(validatorContainer => ({ ...validatorContainer, - validator: (value: any) => { + validator: (value: any, internalComponentError?: ?{error: ?string, errorCode: ?string}) => { if (!value && value !== 0 && value !== false) { return true; } const toValidateValue = isString(value) ? value.trim() : value; // $FlowFixMe dataElementTypes flow error - return validatorContainer.validator(toValidateValue, metaData.allowFutureDate); + return validatorContainer.validator(toValidateValue, internalComponentError); }, })); return validatorContainersForType; } -function buildCompulsoryValidator(metaData: DataElement): Array { +function buildCompulsoryValidator(metaData: DataElement): Array { return metaData.compulsory ? [ @@ -243,12 +250,12 @@ function buildCompulsoryValidator(metaData: DataElement): Array { +): Array { return metaData.unique ? [ { - validator: (value: any, contextProps: ?Object) => { + validator: (value: any, internalComponentError?: ?{error: ?string, errorCode: ?string}, contextProps: ?Object) => { if (!value && value !== 0 && value !== false) { return true; } @@ -265,7 +272,7 @@ function buildUniqueValidator( } export const getValidators = -(metaData: DataElement, querySingleResource: QuerySingleResource): Array => [ +(metaData: DataElement, querySingleResource: QuerySingleResource): Array => [ buildCompulsoryValidator, buildTypeValidators, buildUniqueValidator, diff --git a/src/core_modules/capture-core/utils/validation/index.js b/src/core_modules/capture-core/utils/validation/index.js new file mode 100644 index 0000000000..aa54c5ad24 --- /dev/null +++ b/src/core_modules/capture-core/utils/validation/index.js @@ -0,0 +1,6 @@ +// @flow +export { getValidators } from './getValidators'; +export { validateValue } from './validateValue'; +export { validatorTypes } from './constants'; + +export type { ValidatorContainer } from './getValidators'; diff --git a/src/core_modules/capture-core/utils/validation/validateValue.js b/src/core_modules/capture-core/utils/validation/validateValue.js new file mode 100644 index 0000000000..c91bf08fda --- /dev/null +++ b/src/core_modules/capture-core/utils/validation/validateValue.js @@ -0,0 +1,70 @@ +// @flow +import type { ValidatorContainer } from './getValidators'; +import type { FieldCommitOptionsExtended } from '../../components/D2Form'; + +export type Validations = { + valid: boolean, + errorMessage?: ?string, + errorType?: ?string, + errorData?: Object, +}; + +export const validateValue = async ({ + validators, + value, + validationContext, + postProcessAsyncValidatonInitiation, + commitOptions, +}: { + validators?: Array, + value: any, + validationContext: ?Object, + postProcessAsyncValidatonInitiation?: Function, + commitOptions?: ?FieldCommitOptionsExtended, +}): Promise => { + if (!validators || validators.length === 0) { + return { + valid: true, + }; + } + + const validatorResult = await validators.reduce(async (passPromise, currentValidator) => { + const pass = await passPromise; + if (pass === true) { + let result = currentValidator.validator( + value, + { error: commitOptions?.error, errorCode: commitOptions?.errorCode }, + validationContext, + ); + if (result instanceof Promise) { + result = postProcessAsyncValidatonInitiation + ? postProcessAsyncValidatonInitiation(currentValidator.validatingMessage, result) + : result; + result = await result; + } + + if (result === true || (result && result.valid)) { + return true; + } + return { + message: (result && result.errorMessage) || currentValidator.message, + type: currentValidator.type, + data: result && result.data, + }; + } + return pass; + }, Promise.resolve(true)); + + if (validatorResult !== true) { + return { + valid: false, + errorMessage: validatorResult.message, + errorType: validatorResult.type, + errorData: validatorResult.data, + }; + } + + return { + valid: true, + }; +}; diff --git a/src/core_modules/capture-core/utils/validators/areRelativeRangeValuesSupported.js b/src/core_modules/capture-core/utils/validation/validators/areRelativeRangeValuesSupported.js similarity index 100% rename from src/core_modules/capture-core/utils/validators/areRelativeRangeValuesSupported.js rename to src/core_modules/capture-core/utils/validation/validators/areRelativeRangeValuesSupported.js diff --git a/src/core_modules/capture-core-utils/validators/form/age.validator.js b/src/core_modules/capture-core/utils/validation/validators/form/ageValidator.js similarity index 64% rename from src/core_modules/capture-core-utils/validators/form/age.validator.js rename to src/core_modules/capture-core/utils/validation/validators/form/ageValidator.js index 8006279562..3986f22ebb 100644 --- a/src/core_modules/capture-core-utils/validators/form/age.validator.js +++ b/src/core_modules/capture-core/utils/validation/validators/form/ageValidator.js @@ -1,12 +1,7 @@ // @flow -import { isValidZeroOrPositiveInteger } from './integerZeroOrPositive.validator'; -import { isValidDate } from './date.validator'; -/** - * - * @export - * @param {string} value - * @returns {boolean} - */ +import i18n from '@dhis2/d2-i18n'; +import { isValidZeroOrPositiveInteger } from 'capture-core-utils/validators/form'; +import { isValidDate } from './dateValidator'; type AgeValues = { date?: ?string, @@ -16,10 +11,10 @@ type AgeValues = { } const errorMessages = { - date: 'Please provide a valid date', - years: 'Please provide a valid positive integer', - months: 'Please provide a valid positive integer', - days: 'Please provide a valid positive integer', + date: i18n.t('Please provide a valid date'), + years: i18n.t('Please provide a valid positive integer'), + months: i18n.t('Please provide a valid positive integer'), + days: i18n.t('Please provide a valid positive integer'), }; @@ -50,8 +45,9 @@ function validateNumbers(years: ?string, months: ?string, days: ?string) { return { valid: true }; } -function validateDate(date: ?string, dateFormat: string) { - return (!date || isValidDate(date, dateFormat)) ? +function validateDate(date: ?string, internalComponentError?: ?{error: ?string, errorCode: ?string}) { + const { valid } = isValidDate(date, internalComponentError); + return valid ? { valid: true } : { valid: false, errorMessage: { date: errorMessages.date } }; } @@ -60,7 +56,8 @@ function isAllEmpty(value: AgeValues) { return (!value.date && !value.years && !value.months && !value.days); } -export function isValidAge(value: AgeValues, dateFormat: string) { + +export function isValidAge(value: Object, internalComponentError?: ?{error: ?string, errorCode: ?string}) { if (isAllEmpty(value)) { return false; } @@ -72,5 +69,6 @@ export function isValidAge(value: AgeValues, dateFormat: string) { ); if (!numberResult.valid) return numberResult; - return validateDate(value.date, dateFormat); + + return validateDate(value.date, internalComponentError); } diff --git a/src/core_modules/capture-core/utils/validation/validators/form/dateTimeValidator.js b/src/core_modules/capture-core/utils/validation/validators/form/dateTimeValidator.js new file mode 100644 index 0000000000..f35bd67c25 --- /dev/null +++ b/src/core_modules/capture-core/utils/validation/validators/form/dateTimeValidator.js @@ -0,0 +1,63 @@ +// @flow +import i18n from '@dhis2/d2-i18n'; +import { isValidTime } from 'capture-core-utils/validators/form'; +import { isValidDate } from './dateValidator'; + +type DateTimeValue = { + date?: ?string, + time?: ?string, +}; + +type ValidationResult = { + valid: boolean, + errorMessage?: { + timeError?: ?string, + dateError?: ?string + }, + data?: any, +}; + +const CUSTOM_VALIDATION_MESSAGES = { + INVALID_TIME: i18n.t('Please enter a valid time'), + MISSING_TIME: i18n.t('Please enter a time'), + MISSING_DATE: i18n.t('Please enter a date'), +}; + +export function isValidDateTime(value: DateTimeValue, + internalComponentError?: ?{error: ?string, errorCode: ?string}): ValidationResult { + if (!value) { + return { valid: true }; + } + + const { date, time } = value; + let dateError = ''; + let timeError = ''; + let isValid = true; + + if (!date) { + dateError = CUSTOM_VALIDATION_MESSAGES.MISSING_DATE; + isValid = false; + } else { + const dateValidation = isValidDate(date, internalComponentError); + if (!dateValidation.valid) { + dateError = dateValidation?.errorMessage; + isValid = false; + } + } + + if (!time) { + timeError = CUSTOM_VALIDATION_MESSAGES.MISSING_TIME; + isValid = false; + } else if (!isValidTime(time)) { + timeError = CUSTOM_VALIDATION_MESSAGES.INVALID_TIME; + isValid = false; + } + + return { + valid: isValid, + errorMessage: { + timeError, + dateError, + }, + }; +} diff --git a/src/core_modules/capture-core/utils/validation/validators/form/dateValidator.js b/src/core_modules/capture-core/utils/validation/validators/form/dateValidator.js new file mode 100644 index 0000000000..ef12190f5b --- /dev/null +++ b/src/core_modules/capture-core/utils/validation/validators/form/dateValidator.js @@ -0,0 +1,20 @@ +// @flow + +export function isValidDate(value: ?string, internalComponentError?: ?{error: ?string, errorCode: ?string}) { + if (!value) { + return { valid: false, errorMessage: null }; + } + + if (internalComponentError && internalComponentError?.errorCode === 'INVALID_DATE_MORE_THAN_MAX') { + return { valid: true, errorMessage: null }; + } + + if (internalComponentError?.error) { + return { + valid: false, + errorMessage: internalComponentError?.error, + }; + } + + return { valid: true, errorMessage: null }; +} diff --git a/src/core_modules/capture-core/utils/validators/form/getDateRangeValidator.js b/src/core_modules/capture-core/utils/validation/validators/form/getDateRangeValidator.js similarity index 94% rename from src/core_modules/capture-core/utils/validators/form/getDateRangeValidator.js rename to src/core_modules/capture-core/utils/validation/validators/form/getDateRangeValidator.js index e82e219f27..c76d738184 100644 --- a/src/core_modules/capture-core/utils/validators/form/getDateRangeValidator.js +++ b/src/core_modules/capture-core/utils/validation/validators/form/getDateRangeValidator.js @@ -1,6 +1,6 @@ // @flow import { isValidDate } from './dateValidator'; -import { parseDate } from '../../converters/date'; +import { parseDate } from '../../../converters/date'; /** * * @export diff --git a/src/core_modules/capture-core/utils/validators/form/getDateTimeRangeValidator.js b/src/core_modules/capture-core/utils/validation/validators/form/getDateTimeRangeValidator.js similarity index 97% rename from src/core_modules/capture-core/utils/validators/form/getDateTimeRangeValidator.js rename to src/core_modules/capture-core/utils/validation/validators/form/getDateTimeRangeValidator.js index 0953479053..154749b666 100644 --- a/src/core_modules/capture-core/utils/validators/form/getDateTimeRangeValidator.js +++ b/src/core_modules/capture-core/utils/validation/validators/form/getDateTimeRangeValidator.js @@ -1,6 +1,6 @@ // @flow import { isValidDateTime } from './dateTimeValidator'; -import { parseDate } from '../../converters/date'; +import { parseDate } from '../../../converters/date'; function isValidDateTimeWithEmptyCheck(value: ?Object) { return value && isValidDateTime(value); diff --git a/src/core_modules/capture-core/utils/validators/form/getNumberRangeValidator.js b/src/core_modules/capture-core/utils/validation/validators/form/getNumberRangeValidator.js similarity index 100% rename from src/core_modules/capture-core/utils/validators/form/getNumberRangeValidator.js rename to src/core_modules/capture-core/utils/validation/validators/form/getNumberRangeValidator.js diff --git a/src/core_modules/capture-core/utils/validators/form/getTimeRangeValidator.js b/src/core_modules/capture-core/utils/validation/validators/form/getTimeRangeValidator.js similarity index 100% rename from src/core_modules/capture-core/utils/validators/form/getTimeRangeValidator.js rename to src/core_modules/capture-core/utils/validation/validators/form/getTimeRangeValidator.js diff --git a/src/core_modules/capture-core/utils/validators/form/index.js b/src/core_modules/capture-core/utils/validation/validators/form/index.js similarity index 100% rename from src/core_modules/capture-core/utils/validators/form/index.js rename to src/core_modules/capture-core/utils/validation/validators/form/index.js diff --git a/src/core_modules/capture-core/utils/validation/validators/form/isValidNonFutureDate.js b/src/core_modules/capture-core/utils/validation/validators/form/isValidNonFutureDate.js new file mode 100644 index 0000000000..a2ad362fb6 --- /dev/null +++ b/src/core_modules/capture-core/utils/validation/validators/form/isValidNonFutureDate.js @@ -0,0 +1,21 @@ +// @flow +import i18n from '@dhis2/d2-i18n'; + +const CUSTOM_VALIDATION_MESSAGES = { + INVALID_DATE_MORE_THAN_MAX: i18n.t('A date in the future is not allowed'), +}; + +export const isValidNonFutureDate = (value: string, internalComponentError?: ?{error: ?string, errorCode: ?string}) => { + if (!value) { + return true; + } + + if (internalComponentError && internalComponentError?.errorCode === 'INVALID_DATE_MORE_THAN_MAX') { + return { + valid: false, + errorMessage: CUSTOM_VALIDATION_MESSAGES.INVALID_DATE_MORE_THAN_MAX, + }; + } + + return true; +}; diff --git a/src/core_modules/capture-core/utils/validators/form/ageValidator.js b/src/core_modules/capture-core/utils/validators/form/ageValidator.js deleted file mode 100644 index f2653017fc..0000000000 --- a/src/core_modules/capture-core/utils/validators/form/ageValidator.js +++ /dev/null @@ -1,8 +0,0 @@ -// @flow -import { isValidAge as isValidAgeCore } from 'capture-core-utils/validators/form'; -import { systemSettingsStore } from '../../../metaDataMemoryStores'; - -export function isValidAge(value: Object) { - const format = systemSettingsStore.get().dateFormat; - return isValidAgeCore(value, format); -} diff --git a/src/core_modules/capture-core/utils/validators/form/dateTimeValidator.js b/src/core_modules/capture-core/utils/validators/form/dateTimeValidator.js deleted file mode 100644 index 5db8270a2b..0000000000 --- a/src/core_modules/capture-core/utils/validators/form/dateTimeValidator.js +++ /dev/null @@ -1,8 +0,0 @@ -// @flow -import { isValidDateTime as isValidDateTimeCore } from 'capture-core-utils/validators/form'; -import { systemSettingsStore } from '../../../metaDataMemoryStores'; - -export function isValidDateTime(value: Object) { - const dateFormat = systemSettingsStore.get().dateFormat; - return isValidDateTimeCore(value, dateFormat); -} diff --git a/src/core_modules/capture-core/utils/validators/form/dateValidator.js b/src/core_modules/capture-core/utils/validators/form/dateValidator.js deleted file mode 100644 index 65416c8532..0000000000 --- a/src/core_modules/capture-core/utils/validators/form/dateValidator.js +++ /dev/null @@ -1,8 +0,0 @@ -// @flow -import { isValidDate as isValidDateCore } from 'capture-core-utils/validators/form'; -import { systemSettingsStore } from '../../../metaDataMemoryStores'; - -export function isValidDate(value: string) { - const format = systemSettingsStore.get().dateFormat; - return isValidDateCore(value, format); -} diff --git a/src/core_modules/capture-core/utils/validators/form/isValidNonFutureDate.js b/src/core_modules/capture-core/utils/validators/form/isValidNonFutureDate.js deleted file mode 100644 index 3827f2ee12..0000000000 --- a/src/core_modules/capture-core/utils/validators/form/isValidNonFutureDate.js +++ /dev/null @@ -1,18 +0,0 @@ -// @flow -import i18n from '@dhis2/d2-i18n'; -import moment from 'moment'; -import { parseDate } from '../../converters/date'; - -export const isValidNonFutureDate = (value: string) => { - const { isValid, momentDate } = parseDate(value); - - if (!isValid) { - return isValid; - } - - return { - // $FlowFixMe -> if parseDate returns isValid true, there should always be a momentDate - valid: momentDate.isSameOrBefore(moment()), - message: i18n.t('A future date is not allowed'), - }; -}; diff --git a/src/core_modules/capture-ui/AgeField/AgeField.component.js b/src/core_modules/capture-ui/AgeField/AgeField.component.js index ccf1bbaad9..a125ea8900 100644 --- a/src/core_modules/capture-ui/AgeField/AgeField.component.js +++ b/src/core_modules/capture-ui/AgeField/AgeField.component.js @@ -26,11 +26,17 @@ type InputMessageClasses = { } type DateParser = (value: string) => { isValid: boolean, momentDate: any }; + type DateStringFromMomentFormatter = (momentValue: Object) => string; +type ValidationOptions = { + error?: ?string, + errorCode?: ?string, +}; + type Props = { value: ?AgeValues, - onBlur: (value: ?AgeValues) => void, + onBlur: (value: ?AgeValues, options: ?ValidationOptions) => void, onChange: (value: ?AgeValues) => void, onRemoveFocus: () => void, orientation: $Values, @@ -141,7 +147,7 @@ class D2AgeFieldPlain extends Component { this.props.onBlur(calculatedValues); } - handleDateBlur = (date: ?string) => { + handleDateBlur = (date: ?string, options: ?ValidationOptions) => { const { onParseDate, onGetFormattedDateStringFromMoment, onRemoveFocus, moment } = this.props; onRemoveFocus && onRemoveFocus(); const calculatedValues = date ? getCalculatedValues( @@ -149,7 +155,7 @@ class D2AgeFieldPlain extends Component { onParseDate, onGetFormattedDateStringFromMoment, moment) : null; - this.props.onBlur(calculatedValues); + this.props.onBlur(calculatedValues, options); } renderMessage = (key: string) => { @@ -200,17 +206,13 @@ class D2AgeFieldPlain extends Component { value, onBlur, shrinkDisabled, - dateCalendarOnConvertValueIn, - dateCalendarOnConvertValueOut, dateCalendarWidth, - datePopupAnchorPosition, - dateCalendarTheme, - dateCalendarLocale, datePlaceholder, moment, onParseDate, ...passOnProps } = this.props; + const dateInputContainerClass = classNames( { [defaultClasses.ageDateInputContainerHorizontal]: !isVertical }, ); @@ -222,11 +224,6 @@ class D2AgeFieldPlain extends Component { value={currentValues.date} onChange={date => onChange({ ...currentValues, date })} calendarWidth={dateCalendarWidth} - popupAnchorPosition={datePopupAnchorPosition} - calendarTheme={dateCalendarTheme} - calendarLocale={dateCalendarLocale} - calendarOnConvertValueIn={dateCalendarOnConvertValueIn} - calendarOnConvertValueOut={dateCalendarOnConvertValueOut} placeholder={datePlaceholder} {...passOnProps} /> diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js b/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js index c3d3517db0..b48ee77ae5 100644 --- a/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js +++ b/src/core_modules/capture-ui/DateAndTimeFields/DateField/Date.component.js @@ -1,144 +1,62 @@ // @flow -import React, { createRef } from 'react'; -import { DatePopup } from './DatePopup.component'; -import { DateCalendar } from './DateCalendar.component'; -import { lowerCaseFirstLetter } from '../../internal/utils/string/lowerCaseFirstLetter'; -import { DateInput } from '../../internal/DateInput/DateInput.component'; +import React from 'react'; +import { CalendarInput } from '@dhis2/ui'; +import { systemSettingsStore } from '../../../capture-core/metaDataMemoryStores'; + +type ValidationOptions = { + error?: ?string, + errorCode?: ?string, +}; type Props = { - value: ?string, + value: ?Object, width: number, - maxWidth?: ?number, - calendarWidth?: ?number, - calendarHeight?: ?number, - inputWidth?: ?number, + maxWidth?: ?string, + calendarWidth?: ?string, + inputWidth?: ?string, disabled?: ?boolean, - onBlur: (value: string) => void, + onBlur: (value: Object, options: ValidationOptions) => void, onFocus?: ?() => void, onDateSelectedFromCalendar?: () => void, + calendar?: string, + placeholder?: string, + label?: string, + calendarMaxMoment?: any, + innerMessage?: any }; +type Validation = {| + validationCode: ?string, + validationText: ?string, + error?: boolean, + valid: boolean, +|}; + type State = { - popoverOpen: boolean, + calendarError: ?Validation, }; -export class DateField extends React.Component { - static splitPassOnProps(passOnProps: ?Object) { - const splittedProps = { - input: {}, - popup: {}, - calendar: {}, - }; - - if (!passOnProps) { - return splittedProps; - } - - return Object - .keys(passOnProps) - .reduce((accSplittedProps, propKey) => { - let propContainer; - if (propKey.startsWith(DateField.propContainers.CALENDAR)) { - propContainer = DateField.propContainers.CALENDAR; - } else if (propKey.startsWith(DateField.propContainers.POPUP)) { - propContainer = DateField.propContainers.POPUP; - } else { - propContainer = DateField.propContainers.INPUT; - } - - const outputKey = lowerCaseFirstLetter(propKey.replace(propContainer, '')); - accSplittedProps[propContainer][outputKey] = passOnProps[propKey]; - return accSplittedProps; - }, splittedProps); - } +const formatDate = (date: any, dateFormat: string): ?string => + (dateFormat === 'dd-MM-yyyy' ? date?.format('DD-MM-YYYY') : date?.format('YYYY-MM-DD')); - containerInstance: ?HTMLElement; - handleTextFieldFocus: () => void; - handleDateSelected: (value: string) => void; - handleTextFieldBlur: (event: SyntheticEvent) => void; - hidePopover: () => void; - handleDocumentClick: (event: MouseEvent) => void; - calendarWrapperDOMElementRef: { current: ?HTMLDivElement }; +export class DateField extends React.Component { + handleDateSelected: (value: {calendarDateString: string}) => void; constructor(props: Props) { super(props); - this.state = { - popoverOpen: false, - }; - - this.handleTextFieldFocus = this.handleTextFieldFocus.bind(this); this.handleDateSelected = this.handleDateSelected.bind(this); - this.handleTextFieldBlur = this.handleTextFieldBlur.bind(this); - this.hidePopover = this.hidePopover.bind(this); - this.handleDocumentClick = this.handleDocumentClick.bind(this); - - this.calendarWrapperDOMElementRef = createRef(); } - componentWillUnmount() { - document.removeEventListener('click', this.handleDocumentClick); - } - - static propContainers = { - CALENDAR: 'calendar', - POPUP: 'popup', - INPUT: 'input', - }; - - handleTextFieldFocus() { - document.removeEventListener('click', this.handleDocumentClick); - - this.setState({ - popoverOpen: true, - }); + handleDateSelected(value: { calendarDateString: string, validation: Validation}) { + const { calendarDateString: date, validation } = value || {}; + this.props.onBlur( + date, { + error: validation?.validationText, + errorCode: validation?.validationCode, + }); - this.props.onFocus && this.props.onFocus(); - } - - handleDateSelected(value: string) { - this.props.onBlur(value); - this.hidePopover(); this.props.onDateSelectedFromCalendar && this.props.onDateSelectedFromCalendar(); - document.removeEventListener('click', this.handleDocumentClick); - } - - handleDocumentClick({ target }: MouseEvent) { - const calendarWrapperDOMElement = this.calendarWrapperDOMElementRef.current; - - if (!calendarWrapperDOMElement) { - throw Error('calendar wrapper DOM element not found'); - } - - if (target === calendarWrapperDOMElement || - (target instanceof Node && calendarWrapperDOMElement.contains(target))) { - return; - } - - this.hidePopover(); - document.removeEventListener('click', this.handleDocumentClick); - } - - handleTextFieldBlur({ relatedTarget, currentTarget }: SyntheticFocusEvent) { - const calendarWrapperDOMElement = this.calendarWrapperDOMElementRef.current; - - if (!calendarWrapperDOMElement) { - throw Error('calendar wrapper DOM element not found'); - } - - if (relatedTarget === calendarWrapperDOMElement || - (relatedTarget instanceof Node && calendarWrapperDOMElement.contains(relatedTarget))) { - document.addEventListener('click', this.handleDocumentClick); - } else { - this.props.onBlur(currentTarget.value); - this.hidePopover(); - } - } - - hidePopover() { - this.setState({ - popoverOpen: false, - }); } render() { @@ -146,61 +64,43 @@ export class DateField extends React.Component { width, maxWidth, calendarWidth, - calendarHeight, inputWidth, - onBlur, - onFocus, - onDateSelectedFromCalendar, - ...passOnProps + calendar, + calendarMaxMoment, + value, + innerMessage, } = this.props; - const { popoverOpen } = this.state; + const calculatedInputWidth = inputWidth || width; const calculatedCalendarWidth = calendarWidth || width; - const splittedPassOnProps = DateField.splitPassOnProps(passOnProps); - const calculatedCalendarHeight = calendarHeight || 350; + const calendarType = calendar || 'gregory'; + const format = systemSettingsStore.get().dateFormat; + const errorProps = innerMessage && innerMessage.messageType === 'error' + ? { error: !!innerMessage.message?.dateInnerErrorMessage, + validationText: innerMessage.message?.dateInnerErrorMessage } + : {}; return (
{ this.containerInstance = containerInstance; }} style={{ width, maxWidth, }} > - { /* // $FlowFixMe */} - {/* $FlowFixMe[prop-missing] automated comment */} - -
- { /* // $FlowFixMe */} - {/* $FlowFixMe[prop-missing] automated comment */} - - { /* // $FlowFixMe */} - {/* $FlowFixMe[prop-missing] automated comment */} - - -
); } diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateField/DateCalendar.component.js b/src/core_modules/capture-ui/DateAndTimeFields/DateField/DateCalendar.component.js deleted file mode 100644 index 73fb27a7c6..0000000000 --- a/src/core_modules/capture-ui/DateAndTimeFields/DateField/DateCalendar.component.js +++ /dev/null @@ -1,98 +0,0 @@ -// @flow -/* eslint-disable class-methods-use-this */ -import React, { Component } from 'react'; -import moment from 'moment'; -import InfiniteCalendar from '@joakim_sm/react-infinite-calendar'; -import '@joakim_sm/react-infinite-calendar/styles.css'; -import './customStyles.css'; - -type Props = { - onDateSelected: (value: any) => void, - value?: ?string, - minMoment?: Object, - maxMoment?: Object, - currentWidth: number, - height?: ?number, - classes: Object, - displayOptions?: ?Object, - calendarTheme: Object, - onConvertValueIn: (inputValue: ?string) => Date, - onConvertValueOut: (date: Date) => string, -}; - -export class DateCalendar extends Component { - handleChange: (e: any, dates: ?Array) => void; - displayOptions: Object; - - constructor(props: Props) { - super(props); - this.handleChange = this.handleChange.bind(this); - - this.displayOptions = { - ...DateCalendar.displayOptions, - ...this.props.displayOptions, - }; - } - - shouldComponentUpdate() { - return false; - } - - static displayOptions = { - showHeader: true, - showMonthsForYears: false, - }; - - handleChange(changeDate: Date) { - const changeDateInLocalFormat = this.props.onConvertValueOut(changeDate); - this.props.onDateSelected(changeDateInLocalFormat); - } - - getValue(inputValue: ?string) { - return this.props.onConvertValueIn(inputValue); - } - - getMinMaxProps() { - const { minMoment = moment('1900-01-01'), maxMoment = moment('2099-12-31') } = this.props; - - const minDate = minMoment.toDate(); - const maxDate = maxMoment.toDate(); - - return { - min: minDate, - minDate, - max: maxDate, - maxDate, - }; - } - - render() { - const { - value, - classes, - currentWidth, - height, - minMoment, - maxMoment, - onDateSelected, - displayOptions, - ...passOnProps - } = this.props; - - return ( -
- { /* $FlowFixMe */} - -
- ); - } -} diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateField/DatePopup.component.js b/src/core_modules/capture-ui/DateAndTimeFields/DateField/DatePopup.component.js deleted file mode 100644 index db9e3aef4a..0000000000 --- a/src/core_modules/capture-ui/DateAndTimeFields/DateField/DatePopup.component.js +++ /dev/null @@ -1,87 +0,0 @@ -// @flow -import * as React from 'react'; -import { anchorPositions, modes, absoluteDirections } from './datePopup.const'; -import defaultClasses from './datePopup.module.css'; - -type Props = { - open: boolean, - children: React.Node, - anchorPosition?: $Values, - mode?: $Values, - absoluteDirection: $Values, - inputWidth: number, - calendarWidth: number, - inputUsesFloatingLabel: boolean, -}; - -export class DatePopup extends React.Component { - getAbsoluteBottom() { - const inputUsesFloatingLabel = this.props.inputUsesFloatingLabel; - return inputUsesFloatingLabel ? 60 : 40; - } - getAbsoluteVerticalPosition() { - const absoluteDirection = this.props.absoluteDirection; - return absoluteDirection === absoluteDirections.UP ? { bottom: this.getAbsoluteBottom() } : { top: 0 }; - } - calculateMarginLeftInline() { - const { inputWidth, calendarWidth } = this.props; - return calendarWidth - inputWidth; - } - getPopupStyle() { - const { anchorPosition, mode } = this.props; - - let calendarStyle; - if (anchorPosition === anchorPositions.RIGHT) { - calendarStyle = this.getRightCalendarStyle(mode); - } else if (anchorPosition === anchorPositions.CENTER) { - calendarStyle = this.getCenterCalendarStyle(mode); - } else { - calendarStyle = this.getLeftCalendarStyle(mode); - } - return calendarStyle; - } - - getRightCalendarStyle = (mode: ?$Values) => - (mode === modes.INLINE ? - { marginLeft: `-${this.calculateMarginLeftInline()}px` } : - { ...this.getAbsoluteVerticalPosition(), right: 0 } - ); - - getLeftCalendarStyle = (mode: ?$Values) => - (mode === modes.INLINE ? { } : { ...this.getAbsoluteVerticalPosition(), left: 0 }); - - getCenterCalendarStyle = (mode: ?$Values) => - (mode === modes.INLINE ? - { marginLeft: `-${(this.calculateMarginLeftInline() / 2)}px` } : - { ...this.getAbsoluteVerticalPosition(), left: '50%', transform: 'translate(-50%, 0)' } - ); - - render() { - const { - open, - mode, - children, - } = this.props; - - if (!open) { - return null; - } - - const containerClasses = mode === modes.INLINE ? defaultClasses.containerInline : defaultClasses.containerAbsolute; - const calendarClasses = mode === modes.INLINE ? defaultClasses.calendarInline : defaultClasses.calendarAbsolute; - const calendarStyle = this.getPopupStyle(); - - return ( -
-
- {children} -
-
- ); - } -} diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateField/datePopup.const.js b/src/core_modules/capture-ui/DateAndTimeFields/DateField/datePopup.const.js deleted file mode 100644 index 592588264e..0000000000 --- a/src/core_modules/capture-ui/DateAndTimeFields/DateField/datePopup.const.js +++ /dev/null @@ -1,17 +0,0 @@ -// @flow - -export const anchorPositions = { - LEFT: 'left', - RIGHT: 'right', - CENTER: 'center', -}; - -export const absoluteDirections = { - UP: 'up', - DOWN: 'down', -}; - -export const modes = { - ABSOLUTE: 'absolute', - INLINE: 'inline', -}; diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateField/datePopup.module.css b/src/core_modules/capture-ui/DateAndTimeFields/DateField/datePopup.module.css deleted file mode 100644 index 23ae546712..0000000000 --- a/src/core_modules/capture-ui/DateAndTimeFields/DateField/datePopup.module.css +++ /dev/null @@ -1,8 +0,0 @@ -.containerAbsolute { - position: relative; -} - -.calendarAbsolute { - position: absolute; - z-index: 201; -} \ No newline at end of file diff --git a/src/core_modules/capture-ui/DateAndTimeFields/DateTimeField/DateTime.component.js b/src/core_modules/capture-ui/DateAndTimeFields/DateTimeField/DateTime.component.js index 7ee422ba37..a97077e1ff 100644 --- a/src/core_modules/capture-ui/DateAndTimeFields/DateTimeField/DateTime.component.js +++ b/src/core_modules/capture-ui/DateAndTimeFields/DateTimeField/DateTime.component.js @@ -3,7 +3,6 @@ import React, { Component } from 'react'; import i18n from '@dhis2/d2-i18n'; import classNames from 'classnames'; import defaultClasses from './dateTime.module.css'; - import { orientations } from '../../constants/orientations.const'; import { DateTimeDate } from '../../internal/DateTimeInput/DateTimeDate.component'; import { DateTimeTime } from '../../internal/DateTimeInput/DateTimeTime.component'; @@ -14,24 +13,28 @@ type Value = { }; type Props = { - onBlur: (value: ?Value, options: Object) => void, + onBlur: (value: ?Value, options: Object, internalError: Object) => void, onChange: (value: ?Value) => void, value: Value, - dateMaxWidth: any, - dateWidth: any, + dateMaxWidth: string, + dateWidth: string, calendarWidth?: ?number, orientation: $Values, - calendarTheme: Object, - calendarLocale: Object, - calendarOnConvertValueIn: Function, - calendarOnConvertValueOut: Function, - popupAnchorPosition?: ?any, classes: Object, dateLabel: string, timeLabel: string, + innerMessage: Object +}; + +type State = { + dateError: ?{ + error?: ?string, + errorCode?: ?string + }, }; -export class DateTimeField extends Component { + +export class DateTimeField extends Component { handleTimeChange: (timeValue: string) => void; handleDateChange: (dateValue: string) => void; handleTimeBlur: (timeValue: string) => void; @@ -45,6 +48,9 @@ export class DateTimeField extends Component { constructor(props: Props) { super(props); + this.state = { + dateError: { error: null, errorCode: null }, + }; this.handleTimeChange = this.handleTimeChange.bind(this); this.handleDateChange = this.handleDateChange.bind(this); this.handleTimeBlur = this.handleTimeBlur.bind(this); @@ -71,20 +77,32 @@ export class DateTimeField extends Component { const currentValue = this.getValue(); this.handleBlur({ time: timeValue, - date: currentValue.date, - }, !!currentValue.date); + date: this.props.value?.date, + }, { + touched: !!currentValue.date, + error: this.state.dateError?.error, + errorCode: this.state.dateError?.errorCode, + }); } - handleDateBlur(dateValue: string) { + handleDateBlur(dateValue: string, options: ?Object) { this.touchedFields.add('dateTouched'); - const currentValue = this.getValue(); - this.handleBlur({ - time: currentValue.time, - date: dateValue, - }, !!currentValue.time); + this.setState(() => ({ + dateError: { error: options?.error, errorCode: options?.errorCode }, + }), () => { + const currentValue = this.getValue(); + this.handleBlur({ + time: currentValue.time, + date: dateValue, + }, { + touched: !!currentValue.date, + error: this.state.dateError?.error, + errorCode: this.state.dateError?.errorCode, + }); + }); } - handleBlur(value: Value, otherFieldHasValue: boolean) { + handleBlur(value: Value, otherFieldHasValue: Object) { const onBlur = this.props.onBlur; const touched = this.touchedFields.size === 2; if (!value.date && !value.time) { @@ -94,7 +112,9 @@ export class DateTimeField extends Component { return; } onBlur(value, { - touched: touched || otherFieldHasValue, + touched: touched || otherFieldHasValue.touched, + error: otherFieldHasValue?.error, + errorCode: otherFieldHasValue?.errorCode, }); } @@ -106,18 +126,15 @@ export class DateTimeField extends Component { dateMaxWidth, dateWidth, calendarWidth, - popupAnchorPosition, - calendarTheme, - calendarLocale, - calendarOnConvertValueIn, - calendarOnConvertValueOut, classes, orientation, onBlur, dateLabel, timeLabel, onChange, + innerMessage, ...passOnProps } = this.props; + const isVertical = orientation === orientations.VERTICAL; const currentValue = this.getValue(); const dateValue = currentValue.date; @@ -144,25 +161,26 @@ export class DateTimeField extends Component { onChange={this.handleDateChange} onBlur={this.handleDateBlur} label={dateLabel} - calendarTheme={calendarTheme} - popupAnchorPosition={popupAnchorPosition} - calendarLocale={calendarLocale} - calendarOnConvertValueIn={calendarOnConvertValueIn} - calendarOnConvertValueOut={calendarOnConvertValueOut} classes={classes} + innerMessage={innerMessage} {...passOnProps} /> +
{innerMessage?.message?.dateError}
- {/* $FlowFixMe[cannot-spread-inexact] automated comment */} - +
+ {/* $FlowFixMe[cannot-spread-inexact] automated comment */} + +
{innerMessage?.message?.timeError}
+
); diff --git a/src/core_modules/capture-ui/internal/AgeInput/AgeDateInput.component.js b/src/core_modules/capture-ui/internal/AgeInput/AgeDateInput.component.js index 69b6018ca7..4940f4d3fc 100644 --- a/src/core_modules/capture-ui/internal/AgeInput/AgeDateInput.component.js +++ b/src/core_modules/capture-ui/internal/AgeInput/AgeDateInput.component.js @@ -1,6 +1,5 @@ // @flow import React, { Component } from 'react'; -import moment from 'moment'; import { DateField } from '../../DateAndTimeFields/DateField/Date.component'; import typeof { orientations } from '../../constants/orientations.const'; import { withFocusSaver } from '../../HOC/withFocusSaver'; @@ -19,9 +18,8 @@ class AgeDateInputPlain extends Component { // $FlowFixMe[cannot-spread-inexact] automated comment diff --git a/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeDate.component.js b/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeDate.component.js index b1202d9335..0200268e59 100644 --- a/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeDate.component.js +++ b/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeDate.component.js @@ -1,18 +1,19 @@ // @flow import React from 'react'; import { withFocusSaver } from '../../HOC/withFocusSaver'; -import { DateField } from '../../DateAndTimeFields/DateField/Date.component'; +import { withTextFieldFocusHandler } from '../TextInput/withFocusHandler'; import { withShrinkLabel } from '../../HOC/withShrinkLabel'; - +import { DateField } from '../../DateAndTimeFields/DateField/Date.component'; function DateTimeDatePlain(props) { const { value, ...passOnProps } = props; + return ( ); } -export const DateTimeDate = withFocusSaver()(withShrinkLabel()(DateTimeDatePlain)); +export const DateTimeDate = withFocusSaver()(withShrinkLabel()(withTextFieldFocusHandler()(DateTimeDatePlain))); diff --git a/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeTime.component.js b/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeTime.component.js index d3e13858b3..4d6f7784b5 100644 --- a/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeTime.component.js +++ b/src/core_modules/capture-ui/internal/DateTimeInput/DateTimeTime.component.js @@ -1,8 +1,8 @@ // @flow import React from 'react'; +import { InputField } from '@dhis2-ui/input'; import { withFocusSaver } from '../../HOC/withFocusSaver'; import { withTextFieldFocusHandler } from '../TextInput/withFocusHandler'; -import { TextInput } from '../TextInput/TextInput.component'; import { withShrinkLabel } from '../../HOC/withShrinkLabel'; type Props = { @@ -12,23 +12,28 @@ type Props = { class DateTimeTimePlain extends React.Component { handleBlur = (event) => { - this.props.onBlur(event.currentTarget.value); + this.props.onBlur(event.value); } handleChange = (event) => { - this.props.onChange && this.props.onChange(event.currentTarget.value); + this.props.onChange && this.props.onChange(event.value); } render() { // $FlowFixMe[prop-missing] automated comment - const { onBlur, onChange, value, ...passOnProps } = this.props; + const { onBlur, onChange, value, innerMessage, ...passOnProps } = this.props; + const errorProps = innerMessage + ? { error: !!innerMessage.message?.errorMessage?.timeError, validationText: innerMessage.message?.errorMessage?.timeError } + : {}; + return ( - // $FlowFixMe[cannot-spread-inexact] automated comment - ); } diff --git a/src/core_modules/capture-ui/internal/TextInput/TextInput.component.js b/src/core_modules/capture-ui/internal/TextInput/TextInput.component.js index 0dd99c6715..8f56586745 100644 --- a/src/core_modules/capture-ui/internal/TextInput/TextInput.component.js +++ b/src/core_modules/capture-ui/internal/TextInput/TextInput.component.js @@ -31,8 +31,8 @@ export const TextInput = (props: Props) => { /> : // $FlowFixMe[cannot-spread-inexact] automated comment diff --git a/src/core_modules/capture-ui/internal/TextInput/withFocusHandler.js b/src/core_modules/capture-ui/internal/TextInput/withFocusHandler.js index e66c7ab510..fac5f24e69 100644 --- a/src/core_modules/capture-ui/internal/TextInput/withFocusHandler.js +++ b/src/core_modules/capture-ui/internal/TextInput/withFocusHandler.js @@ -7,7 +7,7 @@ type Props = { onSetFocus: () => void, onRemoveFocus: () => void, inFocus: boolean, - onBlur?: ?(event: SyntheticEvent) => void, + onBlur?: ?(event: SyntheticEvent, rest?: ?Object) => void, onFocus: () => void, classes: { inputWrapperFocused: string, @@ -17,9 +17,9 @@ type Props = { export const withTextFieldFocusHandler = () => (InnerCompnent: React.ComponentType) => class FocusHandlerHOC extends React.Component { - handleBlur = (event: SyntheticEvent) => { + handleBlur = (event: SyntheticEvent, rest?: ?Object) => { this.props.onRemoveFocus(); - this.props.onBlur && this.props.onBlur(event); + this.props.onBlur && this.props.onBlur(event, rest); } handleFocus = () => { diff --git a/yarn.lock b/yarn.lock index f96f6e61a3..4c2c7b3910 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1763,7 +1763,7 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/calendar@10.0.3", "@dhis2-ui/calendar@9.11.0": +"@dhis2-ui/calendar@9.11.0", "@dhis2-ui/calendar@^10.0.3": version "10.0.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-10.0.3.tgz#726560825eb0919db8018097608075a46bd9b638" integrity sha512-yxLESkgO+PlCdkREqzCKGq5KXmKtUjMkRWb6LY3hkpYZ0DmHCrqUpIHGqm/cxA3xo812km2SwpoKgVbmP+T6YA== @@ -5763,10 +5763,10 @@ bluebird@^3.5.3, bluebird@^3.7.2: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== +body-parser@1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== dependencies: bytes "3.1.2" content-type "~1.0.5" @@ -5776,7 +5776,7 @@ body-parser@1.20.2: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.11.0" + qs "6.13.0" raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -7280,11 +7280,16 @@ decimal.js@^10.2.1: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== -decode-uri-component@^0.2.0, decode-uri-component@^0.2.2: +decode-uri-component@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== +decode-uri-component@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.4.1.tgz#2ac4859663c704be22bf7db760a1494a49ab2cc5" + integrity sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ== + decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -7867,6 +7872,11 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== +encodeurl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" + integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== + encoding@^0.1.11, encoding@^0.1.12: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" @@ -8810,36 +8820,36 @@ expect@^27.5.1: jest-message-util "^27.5.1" express@^4.17.3: - version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== + version "4.21.0" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" + integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.2" + body-parser "1.20.3" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.2.0" + finalhandler "1.3.1" fresh "0.5.2" http-errors "2.0.0" - merge-descriptors "1.0.1" + merge-descriptors "1.0.3" methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.7" + path-to-regexp "0.1.10" proxy-addr "~2.0.7" - qs "6.11.0" + qs "6.13.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" + send "0.19.0" + serve-static "1.16.2" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -9094,10 +9104,10 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" -filter-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" - integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ== +filter-obj@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-5.1.0.tgz#5bd89676000a713d7db2e197f660274428e524ed" + integrity sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng== final-form@^4.20.2: version "4.20.10" @@ -9106,13 +9116,13 @@ final-form@^4.20.2: dependencies: "@babel/runtime" "^7.10.0" -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== dependencies: debug "2.6.9" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" on-finished "2.4.1" parseurl "~1.3.3" @@ -10121,9 +10131,9 @@ http-proxy-agent@^4.0.1: debug "4" http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6" + integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA== dependencies: "@types/http-proxy" "^1.17.8" http-proxy "^1.18.1" @@ -12700,10 +12710,10 @@ meow@^8.0.0: type-fest "^0.18.0" yargs-parser "^20.2.3" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== +merge-descriptors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" + integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== merge-stream@^2.0.0: version "2.0.0" @@ -13659,10 +13669,10 @@ path-scurry@^1.11.1, path-scurry@^1.6.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" + integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== path-to-regexp@^1.7.0: version "1.8.0" @@ -14558,12 +14568,12 @@ q@^1.1.2, q@^1.5.1: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== +qs@6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== dependencies: - side-channel "^1.0.4" + side-channel "^1.0.6" qs@~6.10.3: version "6.10.5" @@ -14577,15 +14587,14 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== -query-string@^7.1.1: - version "7.1.3" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328" - integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg== +query-string@^9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-9.1.1.tgz#dbfebb4196aeb2919915f2b2b81b91b965cf03a0" + integrity sha512-MWkCOVIcJP9QSKU52Ngow6bsAWAPlPK2MludXvcrS2bGZSl+T1qX9MZvRIkqUIkGLJquMJHWfsT6eRqUpp4aWg== dependencies: - decode-uri-component "^0.2.2" - filter-obj "^1.1.0" - split-on-first "^1.0.0" - strict-uri-encode "^2.0.0" + decode-uri-component "^0.4.1" + filter-obj "^5.1.0" + split-on-first "^3.0.0" querystringify@^2.1.1: version "2.2.0" @@ -15679,9 +15688,9 @@ rollup-plugin-terser@^7.0.0: terser "^5.0.0" rollup@^2.43.1: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== + version "2.79.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090" + integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ== optionalDependencies: fsevents "~2.3.2" @@ -15896,10 +15905,10 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== +send@0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" + integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== dependencies: debug "2.6.9" depd "2.0.0" @@ -15942,15 +15951,15 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== dependencies: - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.18.0" + send "0.19.0" set-blocking@^2.0.0: version "2.0.0" @@ -16296,10 +16305,10 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -split-on-first@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" - integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== +split-on-first@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-3.0.0.tgz#f04959c9ea8101b9b0bbf35a61b9ebea784a23e7" + integrity sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -16389,11 +16398,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b" integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== -strict-uri-encode@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" - integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ== - string-argv@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"