[Simprints] Bring last changes 3.1.0.1 #248

xurxodev · 2025-03-21T08:55:05Z

📌 References

Issue: https://app.clickup.com/t/86988rv3m #86988rv3m
Related Pull request: Reimplement function to select program stage order direction (for SPIP) dhis2-android-sdk#459

⚙️ branches

app:
Origin: feature-simprints/bring_last_changes_3_1_0_1 Target: develop-spip
dhis2-android-SDK:
Origin: 16080ff19b53f9487d9b44d8dbbabf81c40934ea

🎩 What is the goal?

Bring the last changes in 3.1.0.1

📝 How is it being implemented?

💥 How can it be tested?

The customizations in the app should work.

¡Important is necessary to merge related PR in SDK and create a new tag in the SDK!. This practice is new by @ifoche

💾 Requires DB migration?

Nope, we can just merge this branch.
Yes, but we need to apply it before merging this branch.
Yes, it's already applied.

🎨 UI changes?

Nope, the UI remains as beautiful as it was before!
Yeap, here you have some screenshots-

* chore: Update SDK to 1.10.0.1-SNAPSHOT Signed-off-by: andresmr <[email protected]> * chore: Update SDK to 1.10.0.1 Signed-off-by: andresmr <[email protected]> --------- Signed-off-by: andresmr <[email protected]>

Release/3.0.0.1

# Conflicts: # app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowTest.kt # app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt # app/src/main/res/values/strings.xml

Signed-off-by: andresmr <[email protected]>

build: Update release notes

build: update release notes

…3686)

* Update design system Signed-off-by: andresmr <[email protected]> * SchedulingDialogUiTest wait for idle Signed-off-by: andresmr <[email protected]> * SchedulingDialogUiTest wait for idle Signed-off-by: andresmr <[email protected]> --------- Signed-off-by: andresmr <[email protected]>

# Conflicts: # gradle/libs.versions.toml

Signed-off-by: andresmr <[email protected]>

Update release 3.0.0.1

* Replace Org Unit with mobile ui component * Update designSystem version to `0.3.0-SNAPSHOT` * Fix lint error * Fix org unit selector robot test * Fix `shouldMoveToNextRowWhenClickingNext` test * Fix `selectProgramStage` test * Fix `OrgBottomSheet` clear all btn text * Revert CellTableTest Signed-off-by: andresmr <[email protected]> --------- Signed-off-by: andresmr <[email protected]> Co-authored-by: Siddharth Agarwal <[email protected]>

Signed-off-by: andresmr <[email protected]>

…hanged On focused event (dhis2#3695)

…ed events (dhis2#3696) * fix: [ANDROAPP-6101] Do not show save anyway button if there are errors, only with warnings * ci: [ANDROAPP-6101] Ignore Compose table flaky

…nerate duplicates (dhis2#3688) * test signed commit * test signed commit 5 * test signed commit 6 * test signed commit 7 * test final commit * Rename .java to .kt * fix: [ANDROAPP-6132] Create single event enforcer, implement it throughout all new enrollment/event buttons and orgUnitDialog, migrate EventInitialActivity to kt, review sonarLint issues * fix: [ANDROAPP-6132] remove debug comments * fix: [ANDROAPP-6132] wrong require condition * fix: [ANDROAPP-6132] remove deprecated date utils calls, refactor SingleEventManager to call from presenters when possible * fix: [ANDROAPP-6132] refactor OUTreeFragment and viewmodel selected Org units check * fix: [ANDROAPP-6132] ktlint * fix: [ANDROAPP-6132] fix unit test * fix: [ANDROAPP-6132] remove unused import

dhis2#3673) * fix: [ANDROAPP-6193] App asks device location permission after granting it Signed-off-by: Pablo <[email protected]> * fix: check location is enabled Signed-off-by: Pablo <[email protected]> --------- Signed-off-by: Pablo <[email protected]>

…ted when creating a new event (dhis2#3697)

…s2#3699) Signed-off-by: Pablo <[email protected]>

…his2#3703)

* fix: [ANDROAPP-6169] Update gradle and kotlin version Signed-off-by: Pablo <[email protected]> * fix test Signed-off-by: Pablo <[email protected]> * wait for compose to idle in test Signed-off-by: Pablo <[email protected]> --------- Signed-off-by: Pablo <[email protected]>

…2#3708) Signed-off-by: Pablo <[email protected]>

) Signed-off-by: Pablo <[email protected]> Co-authored-by: Xavier Molloy <[email protected]>

…_3_1_0_1 [PSI] bring last changes 3.1 0.1

…size_to_download [PSI] configure image resize to download

…nts/bring_last_changes_3_1_0_1 # Conflicts: # app/build.gradle.kts # app/src/main/java/org/dhis2/data/service/ReservedValuesWorkerModule.kt # app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt # app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentModule.kt # app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImpl.kt # app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentView.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureModule.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePagerAdapter.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureRepositoryImpl.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormFragment.java # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormModule.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenter.kt # app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java # app/src/main/java/org/dhis2/usescases/login/LoginModule.kt # app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt # app/src/main/java/org/dhis2/usescases/main/program/ProgramModule.kt # app/src/main/java/org/dhis2/usescases/main/program/ProgramPresenter.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepository.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailRepositoryImpl.kt # app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListPresenter.kt # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepository.java # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImpl.java # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchRepositoryImplKt.kt # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEPresenter.java # app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTeiViewModelFactory.kt # app/src/main/java/org/dhis2/usescases/searchTrackEntity/listView/SearchTEList.kt # app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchScreenConfigurator.kt # app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/adapters/DashboardPagerAdapter.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/relationships/RelationshipRepositoryImpl.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataModule.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataPresenter.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt # app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/TeiDashboardCardMapper.kt # app/src/main/res/layout/form_biometrics_attribute.xml # app/src/main/res/layout/form_biometrics_data_element.xml # app/src/main/res/layout/form_biometrics_register.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # app/src/test/java/org/dhis2/usescases/enrollment/EnrollmentPresenterImplTest.kt # app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventIntegrationTest.kt # app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/eventCaptureFragment/EventCaptureFormPresenterTest.kt # app/src/test/java/org/dhis2/usescases/main/program/ProgramPresenterTest.kt # app/src/test/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModelTest.kt # app/src/test/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapperTest.kt # app/src/test/java/org/dhis2/usescases/teiDashboard/dashboardfragments/data/TeiDataPresenterTest.kt # commons/build.gradle.kts # commons/src/main/res/values/colors.xml # dhis2-android-sdk # form/src/main/java/org/dhis2/form/data/EnrollmentRepository.kt # form/src/main/java/org/dhis2/form/data/EventRepository.kt # form/src/main/java/org/dhis2/form/data/metadata/EnrollmentConfiguration.kt # form/src/main/java/org/dhis2/form/ui/DataEntryAdapter.kt # form/src/main/java/org/dhis2/form/ui/DataEntryViewHolderTypes.kt # form/src/main/java/org/dhis2/form/ui/FormView.kt # form/src/main/java/org/dhis2/form/ui/FormViewHolder.kt # form/src/main/java/org/dhis2/form/ui/LayoutProviderImpl.kt # form/src/main/java/org/dhis2/form/ui/provider/LayoutProvider.kt # form/src/main/java/org/dhis2/form/ui/provider/inputfield/DateProvider.kt # form/src/main/java/org/dhis2/form/ui/provider/inputfield/FieldProvider.kt # form/src/main/res/values/strings.xml # gradle/libs.versions.toml # settings.gradle.kts

TEI form contain a lot of biometrics customisations in enrolment presenter To avoid duplicate logic, here hide form in landscape mode. It will be shown only in EnrollmentActivity after click on edit equal to portrait

…' into feature-simprints/bring_last_changes_3_1_0_1

java.lang.IllegalArgumentException: Tmp detached view should be removed from RecyclerView before it can be recycled

ifoche

thanks @xurxodev

andresmr and others added 30 commits June 13, 2024 09:48

chore: Update SDK to 1.10.0.1 (dhis2#3679)

8f04c68

* chore: Update SDK to 1.10.0.1-SNAPSHOT Signed-off-by: andresmr <[email protected]> * chore: Update SDK to 1.10.0.1 Signed-off-by: andresmr <[email protected]> --------- Signed-off-by: andresmr <[email protected]>

Merge pull request dhis2#3682 from dhis2/release/3.0.0.1

bf0b876

Release/3.0.0.1

Merge branch 'release/3.0.1' into release/3.0.0.1

74b77b3

# Conflicts: # app/src/androidTest/java/org/dhis2/usescases/flow/teiFlow/TeiFlowTest.kt # app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt # app/src/main/res/values/strings.xml

build: Update release notes

2f7c277

Signed-off-by: andresmr <[email protected]>

Merge pull request dhis2#3684 from dhis2/update_release_notes_3.0.0.1

385eadc

build: Update release notes

Merge pull request dhis2#3685 from dhis2/update_release_notes_3.0.0.1

079771c

build: update release notes

fix: [ANDROAPP-6182] crash when rotating scheduling dialog (dhis2#3677)

afe0b88

fix: [ANDROAPP-6116] respect relationship constraints (dhis2#3680)

36c2ad5

fix(translations): sync translations from transifex (develop) (dhis2#…

e7d6834

…3686)

Merge branch 'refs/heads/release/3.0.1' into release/3.0.0.1

860b53c

# Conflicts: # gradle/libs.versions.toml

fix: [ANDROAPP-6184] crash on delete data dialog callback (dhis2#3687)

4150534

Merge branch 'refs/heads/release/3.0.1' into release/3.0.0.1

db377fc

Signed-off-by: andresmr <[email protected]>

Add Mock response on old event when filtering by overdue

a2f0286

Signed-off-by: andresmr <[email protected]>

Update version name to 3.0.1

0817432

Signed-off-by: andresmr <[email protected]>

Merge pull request dhis2#3693 from dhis2/release/3.0.0.1

d72f6b6

Update release 3.0.0.1

version code bumped to re-submit to GPlay

7821bc1

fix cell table test (dhis2#3694)

d5326e7

Signed-off-by: andresmr <[email protected]>

ci: [CI] Ignore Compose table flaky tests (dhis2#3698)

0cc90ce

fix: [ANDROAPP-6179] Do not save last focused item if value has not c…

e6d031d

…hanged On focused event (dhis2#3695)

fix: [ANDROAPP-6101] Do not allow to save form with errors in complet…

afda088

…ed events (dhis2#3696) * fix: [ANDROAPP-6101] Do not show save anyway button if there are errors, only with warnings * ci: [ANDROAPP-6101] Ignore Compose table flaky

fix: [ANDROAPP-6187] Reloads forms when event details fields are upda…

8cd2d4d

…ted when creating a new event (dhis2#3697)

fix: [ANDROAPP-6225] Org. Unit dialog crashes on device rotation (dhi…

57abb1f

…s2#3699) Signed-off-by: Pablo <[email protected]>

fix: [ANDROAPP-6158] Shows messages when data set section is empty (d…

9d81916

…his2#3703)

fix: [ANDROAPP-6277] Working lists not filtering search results (dhis…

271ac2c

…2#3708) Signed-off-by: Pablo <[email protected]>

fix: [ANDROAPP-6131] Add progress when event list is loading (dhis2#3681

fb36857

) Signed-off-by: Pablo <[email protected]> Co-authored-by: Xavier Molloy <[email protected]>

xurxodev and others added 24 commits January 9, 2025 07:54

Configure dimension MEDIUM to download images

952770b

Avoid hardcoded SDK version in build.gradle

b395ad7

feat: point to the right commit in the sdk

157b07b

Merge pull request #229 from EyeSeeTea/feature-psi/bring_last_changes…

c430882

…_3_1_0_1 [PSI] bring last changes 3.1 0.1

feat: merged with develop-psi

2b2ec41

Merge pull request #231 from EyeSeeTea/feature-psi/configure_image_re…

b999ce6

…size_to_download [PSI] configure image resize to download

Fix crash to enter in TEI dashboard

4f88738

Fix error to show verify by hidden crash to parse date (ageInMonths)

ce56ad9

Hide TEI form in landscape and to add again editButton:

6bbf480

TEI form contain a lot of biometrics customisations in enrolment presenter To avoid duplicate logic, here hide form in landscape mode. It will be shown only in EnrollmentActivity after click on edit equal to portrait

Remove old compose components to render biometrics in event form

50d8b61

Remove unnecesary condition

4785977

Fix bug calculating months when value is in different formats

4d3ed0d

Fix crash to try show duplicates dialog from TEI form

2280740

Fix bug to register biometrics from TEI form

61170b3

Remove unused old code

fa76682

Merge remote-tracking branch 'origin/feature-simprints/fix_cursor_bug…

8fad0a6

…' into feature-simprints/bring_last_changes_3_1_0_1

Fix crash:

929ce85

java.lang.IllegalArgumentException: Tmp detached view should be removed from RecyclerView before it can be recycled

Remove unused code

f46346d

Fix EnrollmentPresenter tests

f8cbc4e

Fix SearchTEIViewModel tests

7b69c90

Fix scroll to position 0 after clicked search tei item and back to list

6146c6a

Remove unneccesary code

eae9cb8

Fix tests

36251bf

xurxodev marked this pull request as ready for review March 27, 2025 10:47

ifoche changed the base branch from develop-simprints to feature-simprints/fix_cursor_bug April 2, 2025 08:02

sdk version updated

34be861

ifoche approved these changes Apr 2, 2025

View reviewed changes

ifoche merged commit 9dbab57 into feature-simprints/fix_cursor_bug Apr 2, 2025

ifoche deleted the feature-simprints/bring_last_changes_3_1_0_1 branch April 2, 2025 08:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Simprints] Bring last changes 3.1.0.1 #248

[Simprints] Bring last changes 3.1.0.1 #248

xurxodev commented Mar 21, 2025 •

edited

Loading

ifoche left a comment

[Simprints] Bring last changes 3.1.0.1 #248

[Simprints] Bring last changes 3.1.0.1 #248

Conversation

xurxodev commented Mar 21, 2025 • edited Loading

📌 References

⚙️ branches

🎩 What is the goal?

📝 How is it being implemented?

💥 How can it be tested?

💾 Requires DB migration?

🎨 UI changes?

ifoche left a comment

Choose a reason for hiding this comment

xurxodev commented Mar 21, 2025 •

edited

Loading