fixes edit profile - questionItems disable via readOnlyLinkIds #3218

AbdulWahabMemon · 2024-04-25T09:33:03Z

Revert fhircore PR#3069

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

Fixes [link to issue]

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

Revert fhircore PR#3069

ellykits · 2024-05-03T11:59:12Z

android/engine/src/test/java/org/smartregister/fhircore/engine/robolectric/RobolectricTest.kt

+      Observer<T>
+      //        override fun onChanged(o: T?) {
+      //          data[0] = o
+      //          latch.countDown()
+      //          liveData.removeObserver(this)
+      //        }
+      { TODO("Not yet implemented") }


Instead of commenting these lines, make the function parameter o NON-NULLABLE by removing the question mark.

override fun onChanged(o: T) {

ellykits · 2024-05-03T12:03:47Z

@ageryck @AbdulWahabMemon How is this PR different from this one by @DebbieArita #3070

ageryck · 2024-05-06T06:50:08Z

@ageryck @AbdulWahabMemon How is this PR different from this one by @DebbieArita #3070

@ellykits the other PR was evaluating to true when in edit mode irrespective of linkid's supplied hence rending full form in readonly mode
@AbdulWahabMemon share more here

AbdulWahabMemon · 2024-05-06T07:53:57Z

...st/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt

@@ -130,13 +131,16 @@ constructor(
    readOnlyLinkIds: List<String>? = emptyList()
  ): Questionnaire? =
    defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.apply {
-      if (questionnaireConfig.type.isReadOnly() || questionnaireConfig.type.isEditMode()) {
+      if (questionnaireConfig.type.isReadOnly()) {


@ellykits , here its the main change I found to fix the underline issue,
the required/expected behavior is handle with line 141 below.

AbdulWahabMemon · 2024-05-06T07:54:16Z

@ageryck @AbdulWahabMemon How is this PR different from this one by @DebbieArita #3070

@ellykits the other PR was evaluating to true when in edit mode irrespective of linkid's supplied hence rending full form in readonly mode @AbdulWahabMemon share more here

https://github.com/opensrp/fhircore/pull/3218/files#r1590661089

* Remove unanswered linkId from questionnaireResponse so that default initial values for the linkId get picked from Questionnaire * Apply patch changes from #3218

@ignore

* Add Internationalization documentation 📝 (#3221) * Add Internationalization documentation 📝 * Disable autobackup - not recommended * Pin Mac OS runner version to previous stable version | Fix build 💚 * Remove init block blocking thrown errors (#3231) * Interpolate image visible property (#3234) * Configs Versioning (#3189) * Configs versioning setup * init implementation guide version in settings screen * remove unused tag * add string resource * fetch composition referenced in IG * add implementationguide to test * Add ImplementationGuide resource * update tests * Update implementation_guide_config.json * Refactor flow * Rename implementationGuideUrl to implementationGuideId - Code cleanup * Format implementation_guide_config.json * Run spotlessApply * Remove implementationGuideId entry from app config - Add name field to IG config - Update variable name * Refactor implementation from config registry * refactor to use IG by version * Run spotlessApply * Refactors and bug fixes * Update sample ImplementationGuide URL and version * Update fetchRemoteIG app URL * Remove flavour from versionName when fetching IG * Save IG after fetch * save ImplementationGuide to database * introduce fetchConfiguration IG test skeletons * Update IG URL to FQDN * find and sort IG by context-quantity * fix failing tests * update IG tests * use implmentaionGuide extension guide * use version code for context-quantity * empty commit to trigger checks * run spotlessApply * remove unnecessary implementationGuide details from userSettingsScreen * spotlessApply * initiate Implementation Guide documentation * Update strings.xml Co-authored-by: Peter Lubell-Doughtie <[email protected]> --------- Co-authored-by: Simon Njoroge <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> Co-authored-by: Peter Lubell-Doughtie <[email protected]> * Fix questionnaire prepopulation using initialExpression (#3240) * Implement searchable multiselect widget (#3123) * Implement multiselectview Start implementation on multi-select view. Includes the checkbox and listeners Signed-off-by: Elly Kitoto <[email protected]> * Change preview data Signed-off-by: Elly Kitoto <[email protected]> * Use TristateCheckbox on MultiSelect view Signed-off-by: Elly Kitoto <[email protected]> * Implement functionality for generating map required in multiselectview Signed-off-by: Elly Kitoto <[email protected]> * Implement bottomsheet for multi select widget Signed-off-by: Elly Kitoto <[email protected]> * Fix multi-select checkbox select color Signed-off-by: Elly Kitoto <[email protected]> * Implement functionality for node selection Signed-off-by: Elly Kitoto <[email protected]> * Refactor multi select implementation Use Tree data structure as required. Search Tree instead of searching the map. Render the UI from the Tree. Signed-off-by: Elly Kitoto <[email protected]> * Improve UX on multi selector widget search Hide keyboard when search action is triggered. Reset data when search text is empty. Signed-off-by: Elly Kitoto <[email protected]> * Refactor MultiSelect UI to use Compose Scaffold Signed-off-by: Elly Kitoto <[email protected]> * Use ProtoDataStore to store SyncLocations Also refactored how root nodes are identified. Use configuration instead of defaulting to a node without a parent node as the root node. Signed-off-by: Elly Kitoto <[email protected]> * Use selected locations from multi-select widget to sync resources Add comma separated values for _syncLocations query parameter for all requests for the configured sync Resources. Signed-off-by: Elly Kitoto <[email protected]> * Refactor ApplicationConfiguration.syncStrategies to syncStrategy Signed-off-by: Elly Kitoto <[email protected]> * Fix child node checked state issue * Show progress dialog * Add no results view * Refactor initial sync logic + disable sync progresss dialog * Disable progress dialog on initial sync * Fix spotless formatting errors * Add Practitioner to SyncStrategy * Fix failing tests Signed-off-by: Elly Kitoto <[email protected]> --------- Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> Co-authored-by: Hamza Ahmed Khan <[email protected]> Co-authored-by: Hamza Ahmed Khan <[email protected]> * Change questionnaire button styling (#3244) * [Build Variant] ECD App (#3222) * Initial Commit * Add custom view holder for choice input type password in Questionnaire * Add ECD Hack config * Update constants to one place * Remove ECDHack app variant --------- Co-authored-by: mapratama <[email protected]> Co-authored-by: Sebastian <[email protected]> Co-authored-by: SebaMutuku <[email protected]> * Bump express from 4.18.2 to 4.19.2 (#3182) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement feature to compute distance between two locations via Rules (#3107) * Add location service with Preference feature. Signed-off-by: Lentumunai-Mark <[email protected]> * Update tests WIP Signed-off-by: Lentumunai-Mark <[email protected]> * Use subject's Related Entity Location meta tag on related resources (#3097) * Use subject's Related Entity Location meta tag on related resources --------- Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: pld <[email protected]> * eir demo flavor (#3102) * update admin-dashboard-feature docs (#3084) Co-authored-by: Benjamin Mwalimu <[email protected]> * Add location service with Preference feature. Signed-off-by: Lentumunai-Mark <[email protected]> * Resolve conflicts Signed-off-by: Lentumunai-Mark <[email protected]> * Run spotless apply. Signed-off-by: Lentumunai-Mark <[email protected]> * Run spotless Apply. Signed-off-by: Lentumunai-Mark <[email protected]> * Add deny permission for UI automator Signed-off-by: Lentumunai-Mark <[email protected]> * Grant permission on tests where required. Signed-off-by: Lentumunai-Mark <[email protected]> * Remove unused functions. Signed-off-by: Lentumunai-Mark <[email protected]> * rename function to be more descriptive. Signed-off-by: Lentumunai-Mark <[email protected]> * Adress PR feedback provided. Signed-off-by: Lentumunai-Mark <[email protected]> * Format files changed by running spotlessApply Signed-off-by: Lentumunai-Mark <[email protected]> * Update application config to remove outdated variables * Use data store on Location service Signed-off-by: Lentumunai-Mark <[email protected]> * Change grant permission rule. Signed-off-by: Lentumunai-Mark <[email protected]> * fix spotless check Signed-off-by: Lentumunai-Mark <[email protected]> * Change how we're accessing permission rule. Signed-off-by: Lentumunai-Mark <[email protected]> * Run spotless check. Signed-off-by: Lentumunai-Mark <[email protected]> * Try resolve failing test. Signed-off-by: Lentumunai-Mark <[email protected]> * Add permission granted rule. Signed-off-by: Lentumunai-Mark <[email protected]> * Add @ignore to the failing tests Signed-off-by: Lentumunai-Mark <[email protected]> * Test commit, trying out new CI fixes. Signed-off-by: Lentumunai-Mark <[email protected]> * Fix spotless check Signed-off-by: Lentumunai-Mark <[email protected]> * Update AppMainActivityTest.kt * Fix spotless check failing. Signed-off-by: Lentumunai-Mark <[email protected]> --------- Signed-off-by: Lentumunai-Mark <[email protected]> Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: Elly Kitoto <[email protected]> Co-authored-by: pld <[email protected]> Co-authored-by: Roy <[email protected]> Co-authored-by: Owais <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> * Enhance Insight Screen UX (#3195) * swap app and assignment info * update tests * edit insights screen * edit insights screen * edit insights screen * edit insights screen * remove null username * cater for empty parameters * Enhance UI Signed-off-by: Elly Kitoto <[email protected]> --------- Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: Martin Ndegwa <[email protected]> Co-authored-by: Elly Kitoto <[email protected]> * added new property in service-card configs to control the status-icon-size on register screen (#3219) Co-authored-by: owais-vd <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> * Fix remove household (#3262) Co-authored-by: Aleem Azhar <[email protected]> * Fix disable edit fields not working (#3247) * Remove unanswered linkId from questionnaireResponse so that default initial values for the linkId get picked from Questionnaire * Apply patch changes from #3218 * Migrate Knowledge and Workflow SDK library versions (#3266) * Update Code release process documentation * Migrate Knowledge and Workflow SDK library versions * Docs for P2P Sync (#3192) * Docs for P2P Sync * Update image correctly * Update formatting * cleanup text and fix image location * Add links to references * Update p2p documentation --------- Co-authored-by: pld <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> Co-authored-by: Francis Odhiambo <[email protected]> Co-authored-by: Elly Kitoto <[email protected]> * Fix sort and filter issues (#3254) * Activate sorting for related resources Signed-off-by: Elly Kitoto <[email protected]> * Remove material3 dependencies Signed-off-by: Elly Kitoto <[email protected]> * Use all the provided register filter criteria Previously only the filter criteria that were updated by content from the Questionnaire fields were used. Signed-off-by: Elly Kitoto <[email protected]> * Set questionnaire submit button text via configuration Signed-off-by: Elly Kitoto <[email protected]> * Implement clear all action on register filter questionnaire Signed-off-by: Elly Kitoto <[email protected]> * Add more assertion on register filter data queries test Signed-off-by: Elly Kitoto <[email protected]> --------- Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> * Fix filtering by integer * Activate sorting for related resources Signed-off-by: Elly Kitoto <[email protected]> * Remove material3 dependencies Signed-off-by: Elly Kitoto <[email protected]> * Use all the provided register filter criteria Previously only the filter criteria that were updated by content from the Questionnaire fields were used. Signed-off-by: Elly Kitoto <[email protected]> * Set questionnaire submit button text via configuration Signed-off-by: Elly Kitoto <[email protected]> * Implement clear all action on register filter questionnaire Signed-off-by: Elly Kitoto <[email protected]> * Add more assertion on register filter data queries test Signed-off-by: Elly Kitoto <[email protected]> * Fix filter by number Signed-off-by: Elly Kitoto <[email protected]> --------- Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> * Add Encounter Participant to TransformSupportServices * added structure-defnition resource-type in ConfigurationRegistry * 🐛 [WIP] Adding the value set resolver --------- Signed-off-by: Elly Kitoto <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Lentumunai-Mark <[email protected]> Co-authored-by: L≡ZRS <[email protected]> Co-authored-by: Hamza Ahmed Khan <[email protected]> Co-authored-by: Hilary Baraka Egesa <[email protected]> Co-authored-by: Simon Njoroge <[email protected]> Co-authored-by: Benjamin Mwalimu <[email protected]> Co-authored-by: Peter Lubell-Doughtie <[email protected]> Co-authored-by: Elly Kitoto <[email protected]> Co-authored-by: Hamza Ahmed Khan <[email protected]> Co-authored-by: Francis Odhiambo <[email protected]> Co-authored-by: mapratama <[email protected]> Co-authored-by: Sebastian <[email protected]> Co-authored-by: SebaMutuku <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lentumunai Mark <[email protected]> Co-authored-by: Roy <[email protected]> Co-authored-by: Owais <[email protected]> Co-authored-by: Rachel Murabula <[email protected]> Co-authored-by: Syed Owais Ali <[email protected]> Co-authored-by: owais-vd <[email protected]> Co-authored-by: Aleem Azhar <[email protected]>

fixes edit profile - questionItems disable via readOnlyLinkIds

673c753

Revert fhircore PR#3069

AbdulWahabMemon requested review from ageryck, DebbieArita and Rkareko April 25, 2024 09:33

ageryck previously approved these changes May 2, 2024

View reviewed changes

ellykits reviewed May 3, 2024

View reviewed changes

dubdabasoduba and others added 2 commits May 6, 2024 10:02

Merge branch 'opensrp-0.2.5' into edit-profile-fixes

4b03929

comment as per reviewer feedback

c615423

AbdulWahabMemon dismissed ageryck’s stale review via c615423 May 6, 2024 07:50

AbdulWahabMemon commented May 6, 2024

View reviewed changes

ellykits approved these changes May 6, 2024

View reviewed changes

dubdabasoduba merged commit 4d2d504 into opensrp-0.2.5 May 6, 2024

dubdabasoduba deleted the edit-profile-fixes branch May 6, 2024 08:42

ageryck mentioned this pull request May 6, 2024

Limit editing of Questionnaire fields not working #3213

Closed

LZRS added a commit that referenced this pull request May 9, 2024

Apply patch changes from #3218

b58fc3e

ellykits pushed a commit that referenced this pull request May 14, 2024

Fix disable edit fields not working (#3247)

79b564e

* Remove unanswered linkId from questionnaireResponse so that default initial values for the linkId get picked from Questionnaire * Apply patch changes from #3218

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fixes edit profile - questionItems disable via readOnlyLinkIds #3218

fixes edit profile - questionItems disable via readOnlyLinkIds #3218

AbdulWahabMemon commented Apr 25, 2024

ellykits May 3, 2024

AbdulWahabMemon May 6, 2024

ellykits commented May 3, 2024

ageryck commented May 6, 2024

AbdulWahabMemon May 6, 2024

AbdulWahabMemon commented May 6, 2024

fixes edit profile - questionItems disable via readOnlyLinkIds #3218

fixes edit profile - questionItems disable via readOnlyLinkIds #3218

Conversation

AbdulWahabMemon commented Apr 25, 2024

ellykits May 3, 2024

Choose a reason for hiding this comment

AbdulWahabMemon May 6, 2024

Choose a reason for hiding this comment

ellykits commented May 3, 2024

ageryck commented May 6, 2024

AbdulWahabMemon May 6, 2024

Choose a reason for hiding this comment

AbdulWahabMemon commented May 6, 2024