feat: [ANDROAPP-6755] Implement design system table into DataSetInstanceScreen #3978
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andresmr
requested changes
Feb 4, 2025
...tes/src/androidMain/kotlin/org/dhis2/mobile/aggregates/data/DataSetInstanceRepositoryImpl.kt
Outdated
Show resolved
Hide resolved
| @@ -20,3 +22,16 @@ sealed class DataSetScreenState { | |||
|
|
|||
| abstract fun allowTwoPane(canUseTwoPane: Boolean): Boolean | |||
| } | |||
|
|
|||
| sealed class DataSetSectionTable { | |||
There was a problem hiding this comment.
I would extract each class to a specific file except if they are internal
...ates/src/commonMain/kotlin/org/dhis2/mobile/aggregates/ui/viewModel/DataSetTableViewModel.kt
Outdated
Show resolved
Hide resolved
...ates/src/commonMain/kotlin/org/dhis2/mobile/aggregates/ui/viewModel/DataSetTableViewModel.kt
Show resolved
Hide resolved
aggregates/src/commonMain/kotlin/org/dhis2/mobile/aggregates/data/DataSetInstanceRepository.kt
Outdated
Show resolved
Hide resolved
xavimolloy
force-pushed
the
ANDROAPP-6767
branch
from
467dab3 to
c6ade93
Compare
andresmr
requested changes
Feb 6, 2025
| @@ -59,6 +59,23 @@ fun TrackedEntityDataValue?.userFriendlyValue( | |||
| } | |||
| } | |||
|
|
|||
| fun String.userFriendlyValue( | |||
There was a problem hiding this comment.
is this duplicated in the app? where are you using it?
There was a problem hiding this comment.
It is part of the app. It just encapsulate the code to be reusable to any string value instead of the TrackedEntityDataValue or TrackendEntityAttributeValue classes in the SDK
| @@ -51,4 +61,225 @@ internal class DataSetInstanceRepositoryImpl( | |||
| } ?: DataSetRenderingConfig( | |||
| useVerticalTabs = true, | |||
| ) | |||
|
|
|||
| override fun categoryOptionCombinations(categoryUids: List<String>): List<String> { | |||
There was a problem hiding this comment.
public methods in repository should be suspend
xavimolloy
approved these changes
Feb 7, 2025
Balcan
force-pushed
the
ANDROAPP-6755
branch
from
60870d9 to
f11717c
Compare
|
andresmr
approved these changes
Feb 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and include the related jira issue if it exists.
[ jira issue ](https://dhis2.atlassian.net/browse/ANDROAPP-
Solution description
If this PR is a fix include a brief description on how the issue is solved.
Covered unit test cases
Describe the tests that you ran to verify your changes.
Where did you test this issue?
Which Android versions did you test this issue?
Checklist