Create Insights screen and show user info, practitioner details and sync statistics #2873

brandyodhiambo · 2023-11-21T06:41:08Z

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #2857

Engineer Checklist

I have written Unit tests for any new feature(s) and edge cases for bug fixes
I have added any strings visible on UI components to the strings.xml file
I have updated the CHANGELOG.md file for any notable changes to the codebase
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

I have verified Unit tests have been written for any new feature(s) and edge cases
I have verified any strings visible on UI components are in the strings.xml file
I have verifed the CHANGELOG.md file has any notable changes to the codebase
I have verified the solution has been implemented in a configurable and generic way for reuseable components
I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

codecov · 2023-11-21T07:01:43Z

Codecov Report

Merging #2873 (6479f45) into main (ad3a737) will increase coverage by 2.3%.
Report is 116 commits behind head on main.
The diff coverage is 65.4%.

Additional details and impacted files

@@            Coverage Diff            @@
##              main   #2873     +/-   ##
=========================================
+ Coverage     64.5%   66.9%   +2.3%     
- Complexity    1075    1103     +28     
=========================================
  Files          218     223      +5     
  Lines         9635   10434    +799     
  Branches      1897    1920     +23     
=========================================
+ Hits          6218    6984    +766     
+ Misses        2234    2224     -10     
- Partials      1183    1226     +43

Flag	Coverage Δ
engine	`70.4% <67.9%> (-2.3%)`	⬇️
geowidget	`65.5% <33.3%> (+1.1%)`	⬆️
quest	`64.6% <64.2%> (+5.7%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
...ngine/configuration/view/CompoundTextProperties.kt	`100.0% <ø> (ø)`
...gine/configuration/workflow/ApplicationWorkflow.kt	`100.0% <100.0%> (ø)`
...r/fhircore/engine/domain/model/RoundingStrategy.kt	`100.0% <100.0%> (ø)`
...martregister/fhircore/engine/sync/AppSyncWorker.kt	`100.0% <ø> (ø)`
...r/fhircore/engine/task/FhirResourceExpireWorker.kt	`100.0% <100.0%> (ø)`
...fhircore/engine/task/FhirTaskStatusUpdateWorker.kt	`100.0% <100.0%> (ø)`
...g/smartregister/fhircore/engine/ui/theme/Colors.kt	`100.0% <100.0%> (ø)`
...gister/fhircore/engine/util/SharedPreferenceKey.kt	`100.0% <100.0%> (ø)`
...rcore/engine/util/extension/FhirEngineExtension.kt	`80.0% <100.0%> (+2.8%)`	⬆️
...fhircore/engine/util/extension/StringExtensions.kt	`91.6% <100.0%> (ø)`
... and 83 more

... and 28 files with indirect coverage changes

…ange # Conflicts: # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingScreen.kt

…een' into feature/user_setting_insight_screen # Conflicts: # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserInsightScreenFragment.kt # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt

…_setting_screen_modification # Conflicts: # android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/ui/usersetting/UserSettingScreenTest.kt # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingScreen.kt # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingViewModel.kt # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingsEvent.kt

…test

sharon2719 · 2023-11-27T08:06:53Z

@brandy-kay Please attach a video with the new changes.

Raynafs · 2023-12-05T15:02:38Z

I have uploaded the video showing the new User Insight Screen view. From the recording there are views that are not visible because we are using a non proxy variant. You can test it using a proxy variant to see those views. @ellykits

Screencast.from.05-12-2023.05.57.12.ALASIRI.webm

ellykits · 2023-12-06T13:50:40Z

android/engine/src/main/res/values/strings.xml

@@ -24,7 +24,7 @@
    <string name="syncing_down" translatable="false">Syncing down</string>
    <string name="syncing_initiated">Sync initiated&#8230;</string>
    <string name="sync_failed">Sync failed. Check internet connection or try again later</string>
-    <string name="sync_completed_with_errors">Sync completed with errors. Retrying…</string>
+    <string name="sync_completed_with_errors" translatable="false">Sync completed with errors. Retrying…</string>


This string should be translatable. Remove translatable=false property.

ellykits · 2023-12-06T13:51:43Z

android/engine/src/main/res/values/strings.xml

    <string name="percentage_progress" translatable="false">%1$d%%</string>
    <string name="error_occurred" translatable="false">Something went wrong...</string>


These strings should be translatable. Remove translatable=false property.

ellykits · 2023-12-06T14:00:11Z

...st/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt

+  headingOne: String?,
+  contentOne: String?,
+  headingTwo: String?,
+  contentTwo: String?,
+  headingThree: String?,
+  contentThree: String?,
+  headingFour: String?,
+  contentFour: String?,


This can be refactored to accept any n number of items. The header + content information can be captured in a Pair class as key (header) and value(content). Have the items in LIST. Iterate through the list to render the desired content. (The field properties like color can be configured). If need be you may create a new data class to capture the required items if a Pair class will not suffice.

ellykits · 2023-12-06T14:07:19Z

For the UI @Raynafs Can you only display a section if there is content below the section header? The header section should not appear if there is no content to display. From the video shared Unsynced Resources is empty and User Info is empty as well. Should we have some defaults to display @HenryRae if no content is found?

Raynafs · 2023-12-06T14:22:38Z

@ellykits Yes sure working on it

Raynafs · 2023-12-07T08:58:09Z

@ellykits

I have edited the screen to show a different view when synced and unsynced. Kindly check.

When all the data is synced

When we have unsynced data

murayakarina · 2023-12-07T10:15:22Z

@ellykits
Can we have a new section called Server info where we can include details like the SERVER URL? We can also include the keycloak realm and the client ID.

SebaMutuku · 2023-12-07T12:01:49Z

@karina4050. Thanks for the suggestion.
Can this be handled in phase two as an enhancement. Also, do you mind checking with @HenryRae on the same to do a new design with the updates?

ellykits · 2023-12-07T12:16:19Z

@ellykits Can we have a new section called Server info where we can include details like the SERVER URL? We can also include the keycloak realm and the client ID.

We can include some server information like version etc. Keycloak details are sensitive as they are used during deployment.

ellykits

The PR looks good now. Resolve the issue with the strings so we can merge.

ellykits · 2023-12-07T12:22:40Z

android/engine/src/main/res/values/strings.xml

+    <string name="select_month" translatable="false">Select Month</string>
+    <string name="user" translatable="false">User</string>
+    <string name="team" translatable="false">Team</string>
+    <string name="locality" translatable="false">Locality</string>
+    <string name="team_organization" translatable="false">Team(Organization)</string>
+    <string name="care_team" translatable="false">Care Team</string>
+    <string name="location" translatable="false">Location</string>
+    <string name="app_version_code" translatable="false">App version code</string>
+    <string name="build_date" translatable="false">Build date</string>
+    <string name="manufacture" translatable="false">Manufacture</string>
+    <string name="app_versions" translatable="false">App version</string>
+    <string name="os_version" translatable="false">OS Version</string>
+    <string name="device_date" translatable="false">Date</string>
+    <string name="device" translatable="false">Device</string>


These Strings should be translatable. Delete the "translatabale = false" property.

Actually can you deleted this property in all the strings, only the app_name should not be translatable and any branding texts.

Yes sure. Working on it

also, when we remove translatable and the strings get highlighted with a red line, does it mean we have to provide the translations on the alternative string resource like that for Swahili and French? @ellykits @SebaMutuku

…m:opensrp/fhircore into feature/users_setting_screen_modification

ellykits

LGTM 👍

…ync statistics (#2873) * Added user first and last name * fixes the user assigned area * Changes OPENSRP logo color to match new design (black and white) * addes location details * completes the user setting ui editing * Adds refresh with translations and insights page * addes the user setting ui tests * Adds info view * addes the user setting viewmodel tests * runs spotless checks * Creating UserInsight Screen * addes navigation to insight screen * minor edits * designs the user insight screen * adds user insight fragment test and user viewModel test * Writes tests for UserInsight Screen * minor edits * merges user insight branch * Setting up unsynced screen * works on getting database version * finally the unsynched data is represented on the ui * writes user setting viewmodel test * completes user setting viewmodel test and edited user insight screen test * edits the organization text view * adds a separator between user info and unsynced resources * removes hello blank fragment from quest string resource. * fixes code format, removes unused unsyncedResources,removes unessesary plugin and renames OnOfflinemap to onLaunchOfflineMaps * Update UserSettingInsightScreen to match design * edits user insight screen components to use a single view * fixes Questionnaire activity test * fixes Questionnaire activity test * runs spotless check * runs spotless check * still runs spotless check * edits insight info view * edits insight info view * Fix UserInsightScreen padding * Show unsynced and synced views * Add string translations * Fix UserInsightScreen * Remove all unnecessary translatable=false in string.xml --------- Co-authored-by: Raynafs <[email protected]> Co-authored-by: Sharon Akinyi <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> Co-authored-by: Peter Lubell-Doughtie <[email protected]> Co-authored-by: Sebastian <[email protected]>

brandyodhiambo and others added 9 commits November 16, 2023 17:30

Added user first and last name

ae53492

fixes the user assigned area

4dbf553

Changes OPENSRP logo color to match new design (black and white)

a743c3b

addes location details

703bc2b

completes the user setting ui editing

3cacbd7

Adds refresh with translations and insights page

7595cc3

addes the user setting ui tests

24dcf12

Adds info view

9c0a519

addes the user setting viewmodel tests

e58f2bb

brandyodhiambo and others added 18 commits November 21, 2023 10:34

runs spotless checks

80005a1

Creating UserInsight Screen

4017f2d

Merge branch 'main' into feature/users_setting_screen_modification

76b6191

addes navigation to insight screen

e0a7cb2

minor edits

77b5670

designs the user insight screen

41afa0f

adds user insight fragment test and user viewModel test

4881b26

Writes tests for UserInsight Screen

14df5e3

minor edits

3b74117

merges user insight branch

fb08c7c

Setting up unsynced screen

538b32f

works on getting database version

b695c9e

finally the unsynched data is represented on the ui

116c6ca

writes user setting viewmodel test

4ed478f

completes user setting viewmodel test and edited user insight screen …

7f02fd3

…test

Merge branch 'main' into feature/users_setting_screen_modification

5fcdcac

brandyodhiambo added 4 commits December 5, 2023 16:58

fixes Questionnaire activity test

2531ac4

runs spotless check

04ec807

runs spotless check

c2355e7

still runs spotless check

f0bf52e

ellykits requested changes Dec 6, 2023

View reviewed changes

SebaMutuku and others added 5 commits December 6, 2023 17:34

Merge branch 'main' into feature/users_setting_screen_modification

bb3370b

edits insight info view

22dcc5a

edits insight info view

cb70629

Fix UserInsightScreen padding

f7e6b9e

Show unsynced and synced views

29ff0bc

Raynafs added 2 commits December 7, 2023 14:44

Add string translations

7ca359e

Fix UserInsightScreen

a5815e8

ellykits reviewed Dec 7, 2023

View reviewed changes

SebaMutuku and others added 3 commits December 7, 2023 15:31

Merge branch 'main' into feature/users_setting_screen_modification

b075015

Remove all unnecessary translatable=false in string.xml

35c4c3c

Merge branch 'feature/users_setting_screen_modification' of github.co…

6479f45

…m:opensrp/fhircore into feature/users_setting_screen_modification

Raynafs requested a review from ellykits December 7, 2023 14:04

ellykits approved these changes Dec 7, 2023

View reviewed changes

Raynafs merged commit 8e48e2c into main Dec 7, 2023

Raynafs deleted the feature/users_setting_screen_modification branch December 7, 2023 14:13

ndegwamartin mentioned this pull request Apr 12, 2024

Enhance Insights screen UX #3194

Closed

1 task

ndegwamartin mentioned this pull request Sep 4, 2024

Insights view not rendering correct unsynced records status on initial load #3476

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create Insights screen and show user info, practitioner details and sync statistics #2873

Create Insights screen and show user info, practitioner details and sync statistics #2873

brandyodhiambo commented Nov 21, 2023 •

edited

Loading

codecov bot commented Nov 21, 2023 •

edited

Loading

sharon2719 commented Nov 27, 2023

Raynafs commented Dec 5, 2023

ellykits Dec 6, 2023

ellykits Dec 6, 2023

ellykits Dec 6, 2023 •

edited

Loading

ellykits commented Dec 6, 2023

Raynafs commented Dec 6, 2023

Raynafs commented Dec 7, 2023

murayakarina commented Dec 7, 2023

SebaMutuku commented Dec 7, 2023 •

edited

Loading

ellykits commented Dec 7, 2023

ellykits left a comment

ellykits Dec 7, 2023

ellykits Dec 7, 2023

Raynafs Dec 7, 2023

brandyodhiambo Dec 7, 2023

ellykits left a comment

		<string name="percentage_progress" translatable="false">%1$d%%</string>
		<string name="error_occurred" translatable="false">Something went wrong...</string>

Create Insights screen and show user info, practitioner details and sync statistics #2873

Create Insights screen and show user info, practitioner details and sync statistics #2873

Conversation

brandyodhiambo commented Nov 21, 2023 • edited Loading

codecov bot commented Nov 21, 2023 • edited Loading

Codecov Report

sharon2719 commented Nov 27, 2023

Raynafs commented Dec 5, 2023

ellykits Dec 6, 2023

Choose a reason for hiding this comment

ellykits Dec 6, 2023

Choose a reason for hiding this comment

ellykits Dec 6, 2023 • edited Loading

Choose a reason for hiding this comment

ellykits commented Dec 6, 2023

Raynafs commented Dec 6, 2023

Raynafs commented Dec 7, 2023

murayakarina commented Dec 7, 2023

SebaMutuku commented Dec 7, 2023 • edited Loading

ellykits commented Dec 7, 2023

ellykits left a comment

Choose a reason for hiding this comment

ellykits Dec 7, 2023

Choose a reason for hiding this comment

ellykits Dec 7, 2023

Choose a reason for hiding this comment

Raynafs Dec 7, 2023

Choose a reason for hiding this comment

brandyodhiambo Dec 7, 2023

Choose a reason for hiding this comment

ellykits left a comment

Choose a reason for hiding this comment

brandyodhiambo commented Nov 21, 2023 •

edited

Loading

codecov bot commented Nov 21, 2023 •

edited

Loading

ellykits Dec 6, 2023 •

edited

Loading

SebaMutuku commented Dec 7, 2023 •

edited

Loading