From 7efc255dee390726125c5cf02d9ff218ca029c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Miguel=20Rubio?= Date: Thu, 30 Jan 2025 14:53:11 +0100 Subject: [PATCH 1/3] chore: [ANDROAPP-6797] Update rule engine to 3.3.2 (#3970) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6db9a9a6d6..f88d2af1f4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ hilt = '2.47' jacoco = '0.8.10' designSystem = "0.4.1" dhis2sdk = "1.11.1" -ruleEngine = "3.2.0" +ruleEngine = "3.3.2" expressionParser = "1.1.0" appcompat = "1.6.1" annotation = "1.6.0" From e21763f407caefe4d58c7e9057194094db9345f5 Mon Sep 17 00:00:00 2001 From: Xavier Molloy Date: Thu, 30 Jan 2025 16:52:33 +0100 Subject: [PATCH 2/3] build: Update vname and vcode and release.md file (#3971) * build: update version vName and vCode * build: update RELEASE.md file --- RELEASE.md | 88 +-------------------------------------- gradle/libs.versions.toml | 4 +- 2 files changed, 4 insertions(+), 88 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 72f1b71d8f..796ad00fc1 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,89 +1,5 @@ -# Release notes - Android App for DHIS2 - 3.1.1 +# Release notes - Android App for DHIS2 - 3.1.1.1 ### Bug -[ANDROAPP-5888](https://dhis2.atlassian.net/browse/ANDROAPP-5888) RTSM - Stock distribution allows entry of zero values - -[ANDROAPP-6108](https://dhis2.atlassian.net/browse/ANDROAPP-6108) \[mobile-ui\] Bottom sheet Icon button is displaced - -[ANDROAPP-6220](https://dhis2.atlassian.net/browse/ANDROAPP-6220) Login error - Fragmentation has been destroyed - -[ANDROAPP-6281](https://dhis2.atlassian.net/browse/ANDROAPP-6281) Formatting of org unit selector buttons over android navigation bar - -[ANDROAPP-6282](https://dhis2.atlassian.net/browse/ANDROAPP-6282) Misalignment of TEI list and dashboard cards - -[ANDROAPP-6317](https://dhis2.atlassian.net/browse/ANDROAPP-6317) App not scrolling to the top of the list after selecting or deselecting working list - -[ANDROAPP-6354](https://dhis2.atlassian.net/browse/ANDROAPP-6354) \[LineListing\] search by org unit or category no working - -[ANDROAPP-6394](https://dhis2.atlassian.net/browse/ANDROAPP-6394) Conflict message - Change future date message when no future date was entered - -[ANDROAPP-6418](https://dhis2.atlassian.net/browse/ANDROAPP-6418) \[Data Sets\] Values are not shown after saving them - -[ANDROAPP-6440](https://dhis2.atlassian.net/browse/ANDROAPP-6440) Maps view pin hidden behind location - -[ANDROAPP-6457](https://dhis2.atlassian.net/browse/ANDROAPP-6457) Maps card - expanded card maybe more than 70% of the map and When the user taps outside the card \(when expanded\) the card does not collapses. - -[ANDROAPP-6477](https://dhis2.atlassian.net/browse/ANDROAPP-6477) Programs are hidden after navigating to settings and back - -[ANDROAPP-6480](https://dhis2.atlassian.net/browse/ANDROAPP-6480) Tei scheduled events for "today" show incorrect overdue icon - -[ANDROAPP-6482](https://dhis2.atlassian.net/browse/ANDROAPP-6482) TEI Is created even if it was discarded - -[ANDROAPP-6509](https://dhis2.atlassian.net/browse/ANDROAPP-6509) Assign enrollment org unit as the default org unit when creating an event - -[ANDROAPP-6519](https://dhis2.atlassian.net/browse/ANDROAPP-6519) Barcode scanner crashes DHIS2-RTS - -[ANDROAPP-6524](https://dhis2.atlassian.net/browse/ANDROAPP-6524) Option code is displayed instead of name - -[ANDROAPP-6533](https://dhis2.atlassian.net/browse/ANDROAPP-6533) Background color is visible behind bottom navigation bar - -[ANDROAPP-6535](https://dhis2.atlassian.net/browse/ANDROAPP-6535) Bidirectional relationships are created in the oppsite direction when created from TO - -[ANDROAPP-6543](https://dhis2.atlassian.net/browse/ANDROAPP-6543) Image download not working correctly - -[ANDROAPP-6549](https://dhis2.atlassian.net/browse/ANDROAPP-6549) DHIS2-RTS: Data entry window not closing when selecting blue bullet - -[ANDROAPP-6579](https://dhis2.atlassian.net/browse/ANDROAPP-6579) Limit the menu size in the enrollment dashboard when the program name is too long. - -[ANDROAPP-6628](https://dhis2.atlassian.net/browse/ANDROAPP-6628) Due Date in Scheduled Event Card Always Red - -[ANDROAPP-6644](https://dhis2.atlassian.net/browse/ANDROAPP-6644) Incorrect style and icon for overdue scheduled events in - -[ANDROAPP-6652](https://dhis2.atlassian.net/browse/ANDROAPP-6652) NullPointerException: Attempt to invoke virtual method 'android.content.res.Resources android.view.View.getResources\(\)'... - -[ANDROAPP-6657](https://dhis2.atlassian.net/browse/ANDROAPP-6657) Implement a load bar when searching in "This Area" - -[ANDROAPP-6660](https://dhis2.atlassian.net/browse/ANDROAPP-6660) Incorrect list of available periods - -[ANDROAPP-6667](https://dhis2.atlassian.net/browse/ANDROAPP-6667) \[Program Rules\] Warning AND Error on complete not showing - -[ANDROAPP-6673](https://dhis2.atlassian.net/browse/ANDROAPP-6673) Home filters are not displayed - -[ANDROAPP-6695](https://dhis2.atlassian.net/browse/ANDROAPP-6695) IllegalArgumentException: com.dhis2: Targeting S\+ \(version 31 and above\) requires that one of FLAG\_IMMUTABLE or FLAG\_MUTABL... - -[ANDROAPP-6696](https://dhis2.atlassian.net/browse/ANDROAPP-6696) IllegalStateException: Can not perform this action after onSaveInstanceState - -[ANDROAPP-6705](https://dhis2.atlassian.net/browse/ANDROAPP-6705) Tei attributes and data elements flagging allowed future dates as errors incorrectly in Form - -[ANDROAPP-6707](https://dhis2.atlassian.net/browse/ANDROAPP-6707) Unable to complete event - -[ANDROAPP-6715](https://dhis2.atlassian.net/browse/ANDROAPP-6715) Crash when selecting a checkbox option set - -[ANDROAPP-6717](https://dhis2.atlassian.net/browse/ANDROAPP-6717) Crash when syncing a TEI from map screen - -[ANDROAPP-6753](https://dhis2.atlassian.net/browse/ANDROAPP-6753) Event program takes too long to load in server https://data.zim-dreams.org - -[ANDROAPP-6759](https://dhis2.atlassian.net/browse/ANDROAPP-6759) Version comparison returns a wrong value in some cases - -[ANDROAPP-6760](https://dhis2.atlassian.net/browse/ANDROAPP-6760) Rule engine context events include deleted events - -[ANDROAPP-6763](https://dhis2.atlassian.net/browse/ANDROAPP-6763) Status bar overlaps the app, obstructing buttons and making the interface unreadable - -[ANDROAPP-6771](https://dhis2.atlassian.net/browse/ANDROAPP-6771) Crash when creating a tei after searching through org unit - -[ANDROAPP-6774](https://dhis2.atlassian.net/browse/ANDROAPP-6774) Bottomsheet buttons padding fix - -[ANDROAPP-6776](https://dhis2.atlassian.net/browse/ANDROAPP-6776) Incorrect background shown in EventInitial screen after Android 35 corrections - -[ANDROAPP-6777](https://dhis2.atlassian.net/browse/ANDROAPP-6777) inconsistent behaviour in org unit selector search bar \ No newline at end of file +[ANDROAPP-6797](https://dhis2.atlassian.net/browse/ANDROAPP-6797) Update rule engine \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f88d2af1f4..90cb5757db 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] sdk = "35" minSdk = "21" -vCode = "139" -vName = "3.1.1" +vCode = "140" +vName = "3.1.1.1" gradle = "8.7.2" kotlin = '2.0.21' hilt = '2.47' From d7b30d9ff593bf331de69caf55a0e49ab67ecadd Mon Sep 17 00:00:00 2001 From: andresmr Date: Fri, 31 Jan 2025 11:19:53 +0100 Subject: [PATCH 3/3] build: update what's new --- whatsnew/whatsnew-en-US | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US index dcb99e68af..fab98b0da7 100644 --- a/whatsnew/whatsnew-en-US +++ b/whatsnew/whatsnew-en-US @@ -1,9 +1,4 @@ -This is a patch version that fixes: - -ANDROAPP-5888 RTSM - Stock distribution allows entry of zero values - -ANDROAPP-6108 Bottom sheet Icon button is displaced - -ANDROAPP-6715 Crash when selecting a checkbox option set - -ANDROAPP-6220 Login error - Fragmentation has been destroyed - -ANDROAPP-6281 Formatting of org unit selector buttons over android navigation bar - -ANDROAPP-6282 Misalignment of TEI list and dashboard cards - -... +This is a hotfix version that fixes: +- ANDROAPP-6797 Update rule engine to 3.3.2 + You can find all the details on Jira and Github. \ No newline at end of file