Skip to content

fix: Validate no datavalues for some event statuses [DHIS2-17658]#17934

Merged
enricocolasante merged 4 commits intomasterfrom
DHIS2-17658
Jul 2, 2024
Merged

fix: Validate no datavalues for some event statuses [DHIS2-17658]#17934
enricocolasante merged 4 commits intomasterfrom
DHIS2-17658

Conversation

@enricocolasante
Copy link
Contributor

Following on #17890.
Event statuses OVERDUE, SKIPPED and SCHEDULE do not allow to define data values. This PR is adding a validation to verify this.

@enricocolasante enricocolasante requested a review from teleivo July 1, 2024 14:56
…lidation/ValidationCode.java

Co-authored-by: teleivo <teleivo@users.noreply.github.com>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Jul 2, 2024

@enricocolasante enricocolasante merged commit 9b2c905 into master Jul 2, 2024
@enricocolasante enricocolasante deleted the DHIS2-17658 branch July 2, 2024 07:19
enricocolasante added a commit that referenced this pull request Jul 8, 2024
…7934)

* fix: Validate no datavalues for some event statuses [DHIS2-17658]

* Fix tests

* Fix code review comments

* Update dhis-2/dhis-api/src/main/java/org/hisp/dhis/tracker/imports/validation/ValidationCode.java

Co-authored-by: teleivo <teleivo@users.noreply.github.com>

---------

Co-authored-by: teleivo <teleivo@users.noreply.github.com>
enricocolasante added a commit that referenced this pull request Jul 8, 2024
….41) (#18015)

* fix: Add event validation when updating status [DHIS2-17658] (#17890)

* fix: Add event validation when updating status [DHIS2-17658]

* Fix sonar issues

* Fix code review comments

* Fix code review comments

* Fix code review comments

* Fix code review comments

* fix: Validate no datavalues for some event statuses [DHIS2-17658] (#17934)

* fix: Validate no datavalues for some event statuses [DHIS2-17658]

* Fix tests

* Fix code review comments

* Update dhis-2/dhis-api/src/main/java/org/hisp/dhis/tracker/imports/validation/ValidationCode.java

Co-authored-by: teleivo <teleivo@users.noreply.github.com>

---------

Co-authored-by: teleivo <teleivo@users.noreply.github.com>

* fix: Skip mandatory data value validation for UPDATE [DHIS2-17560] (#17835)

* fix: Skip mandatory data value validation for UPDATE [DHIS2-17560]

* More clean up

* Fix tests

* Add tests

* Add tests

---------

Co-authored-by: teleivo <teleivo@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants