Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix overdue service status #2507

Merged
merged 12 commits into from
Jun 29, 2023
Merged

Fix overdue service status #2507

merged 12 commits into from
Jun 29, 2023

Conversation

dubdabasoduba
Copy link
Member

@dubdabasoduba dubdabasoduba commented Jun 29, 2023

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

Fixes https://github.com/opensrp/fhir-resources/issues/1736

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

@dubdabasoduba dubdabasoduba self-assigned this Jun 29, 2023
@codecov
Copy link

codecov bot commented Jun 29, 2023

Codecov Report

Merging #2507 (c7ad1a1) into main (2ea8fa1) will increase coverage by 0.3%.
The diff coverage is 62.1%.

Impacted file tree graph

@@            Coverage Diff            @@
##              main   #2507     +/-   ##
=========================================
+ Coverage     64.8%   65.2%   +0.3%     
- Complexity    1050    1086     +36     
=========================================
  Files          209     212      +3     
  Lines         9156    9353    +197     
  Branches      1805    1859     +54     
=========================================
+ Hits          5942    6104    +162     
+ Misses        2059    2057      -2     
- Partials      1155    1192     +37     
Flag Coverage Δ
engine 72.6% <59.8%> (-0.5%) ⬇️
geowidget 63.2% <ø> (ø)

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

Impacted Files Coverage Δ
...core/engine/configuration/view/ColumnProperties.kt 100.0% <ø> (ø)
...ore/engine/configuration/view/DividerProperties.kt 0.0% <0.0%> (ø)
...ine/configuration/view/ViewPropertiesSerializer.kt 23.8% <0.0%> (-2.6%) ⬇️
...e/engine/ui/bottomsheet/RegisterBottomSheetView.kt 51.2% <0.0%> (-2.5%) ⬇️
...g/smartregister/fhircore/quest/QuestApplication.kt 44.2% <ø> (+0.8%) ⬆️
...er/fhircore/quest/ui/shared/components/CardView.kt 81.0% <ø> (ø)
...hircore/quest/ui/shared/components/CompoundText.kt 75.2% <0.0%> (-0.9%) ⬇️
...fhircore/quest/util/extensions/ConfigExtensions.kt 67.1% <0.0%> (-2.9%) ⬇️
...rcore/quest/ui/usersetting/UserSettingViewModel.kt 61.9% <29.4%> (-9.5%) ⬇️
...core/engine/configuration/view/ButtonProperties.kt 48.8% <33.3%> (-3.4%) ⬇️
... and 30 more

... and 5 files with indirect coverage changes

Comment on lines 438 to 439
Timber.e("Task.status is null", Exception())
ServiceStatus.DUE.name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think we need to use the DUE state here. It's already used when task status is READY.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. I think I will make them UPCOMING. Since it seems like the task is not ready to be worked on if it's on hold

ellykits
ellykits previously approved these changes Jun 29, 2023
ellykits
ellykits previously approved these changes Jun 29, 2023
ekigamba
ekigamba previously approved these changes Jun 29, 2023
@pld pld dismissed stale reviews from ekigamba and ellykits via 1e38a1b June 29, 2023 18:14
@pld pld force-pushed the feature/fix_overdue_status branch from 1e38a1b to c7ad1a1 Compare June 29, 2023 18:27
@pld pld merged commit 2a8b3a3 into main Jun 29, 2023
@pld pld deleted the feature/fix_overdue_status branch June 29, 2023 19:18
@pld pld restored the feature/fix_overdue_status branch June 29, 2023 19:20
qiarie pushed a commit that referenced this pull request Jan 15, 2025
* Add the Service Card color test

* 🐛 Fix overdue status 0.2.4

* ⏪ Remove unwated tests

* ✨ Mark all the non ready, in-progres, requested, completed or cancelled as UPCOMING

* null tasks are upcoming

---------

Co-authored-by: pld <peter@ona.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants