AC-625: Check if newly created provider is similar to an existing one by deepakpsad · Pull Request #613 · openmrs/openmrs-contrib-android-client

deepakpsad · 2019-07-06T18:12:09Z

Description of what I changed

Added a check for matching providers
Created an AlertDialog to show matching providers

Issue I worked on

JIRA Issue: https://issues.openmrs.org/browse/AC-625

Checklist: I completed these to help reviewers :)

My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).

I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)

All new and existing tests passed.

My pull request is based on the latest changes of the master branch.

codecov-io · 2019-07-06T18:21:35Z

Codecov Report

Merging #613 into master will decrease coverage by <.01%.
The diff coverage is 12.5%.

@@            Coverage Diff            @@
##           master    #613      +/-   ##
=========================================
- Coverage   14.31%   14.3%   -0.01%     
=========================================
  Files         194     195       +1     
  Lines        9028    9093      +65     
  Branches      785     790       +5     
=========================================
+ Hits         1292    1301       +9     
- Misses       7657    7713      +56     
  Partials       79      79

Impacted Files	Coverage Δ
...openmrs/mobile/utilities/ApplicationConstants.java	`0% <ø> (ø)`	⬆️
...agerdashboard/addprovider/AddProviderContract.java	`0% <ø> (ø)`	⬆️
...gerdashboard/ProviderManagerDashboardFragment.java	`0% <0%> (ø)`	⬆️
...dprovider/MatchingProviderRecyclerViewAdapter.java	`0% <0%> (ø)`
...agerdashboard/addprovider/AddProviderFragment.java	`0% <0%> (ø)`	⬆️
...d/ProviderManagerDashboardRecyclerViewAdapter.java	`0% <0%> (ø)`	⬆️
...gerdashboard/addprovider/AddProviderPresenter.java	`96.66% <100%> (+1.42%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ed4619f...dcef39b. Read the comment docs.

f4ww4z

Thanks @deepak140596 . Can you add a box for each provider row item in this dialog? Use a background color from color.xml res.

Also, address my other comments.

...org/openmrs/mobile/activities/providermanagerdashboard/addprovider/AddProviderPresenter.java

...org/openmrs/mobile/activities/providermanagerdashboard/ProviderManagerDashboardFragment.java

.../mobile/activities/providermanagerdashboard/ProviderManagerDashboardRecyclerViewAdapter.java

.../org/openmrs/mobile/activities/providermanagerdashboard/addprovider/AddProviderFragment.java

f4ww4z · 2019-07-08T02:42:23Z

...ile/activities/providermanagerdashboard/addprovider/MatchingProviderRecyclerViewAdapter.java

+
+        // TODO open provider dashboard for clicked provider
+        holder.providerDetailsCL.setOnClickListener(v -> {
+            // Action


Go ahead and write this implementation.

This will open the Provider-Patient relationship dashboard which will be implemented next. Currently we don't have provider dashboard.

I see, you're right. @deepak140596 file up a new issue for this and ping me there.

Actually AC-624 addresses this issue.

@deepak140596 I was referring to creating the provider dashboard. I went ahead and created the issue, now it's ready for work :)

...ile/activities/providermanagerdashboard/addprovider/MatchingProviderRecyclerViewAdapter.java

deepakpsad · 2019-07-08T15:09:09Z

I have added a stroked outline to the providers. Adding colors to the background is not looking good

deepakpsad · 2019-07-08T16:48:49Z

@f4ww4z , please review the changes. Also the builds have passed.

f4ww4z · 2019-07-09T11:24:59Z

@deepak140596 that kind of stroked outline is used for input fields in the app, so we can't use it here.

@deepak140596 See the list view here. Please change the similar providers dialog to be like that. Make sure to center the view in the box.

deepakpsad · 2019-07-09T19:27:41Z

@f4ww4z , as both the CardView and AlertDialog have the same white background as default, I changed the CardView's background as light shade of grey to distinguish between background and foreground.

f4ww4z

@deepak140596 The weight of the card view is too much. A white color is fine, no need to change it. Follow this style, it will look much better.

f4ww4z · 2019-07-10T04:12:09Z

openmrs-client/src/main/res/layout/row_matching_provider.xml

+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#EBEAEA">


Did you see color.xml?

I have removed this part of the code as we are using the default color. Also do I need to remove the Card View?

deepakpsad · 2019-07-10T20:56:17Z

@f4ww4z ,with white color, the look will be like this.

f4ww4z

Great work @deepak140596 , now the dialog looks materialized.

deepakpsad force-pushed the AC-625 branch from d3bd052 to e91c599 Compare July 6, 2019 18:22

deepakpsad changed the title ~~AC-625: Check matching Providers~~ AC-625: Check if newly created provider is similar to an existing one Jul 6, 2019

f4ww4z requested changes Jul 8, 2019

View reviewed changes

deepakpsad force-pushed the AC-625 branch from e91c599 to 725a08f Compare July 8, 2019 15:12

deepakpsad closed this Jul 8, 2019

deepakpsad force-pushed the AC-625 branch from 725a08f to 544c0c4 Compare July 8, 2019 15:16

deepakpsad reopened this Jul 8, 2019

deepakpsad force-pushed the AC-625 branch from f42f6cb to 04b510b Compare July 9, 2019 19:32

f4ww4z requested changes Jul 10, 2019

View reviewed changes

AC-625: Find matching providers

dcef39b

deepakpsad force-pushed the AC-625 branch from 04b510b to dcef39b Compare July 10, 2019 21:01

f4ww4z approved these changes Jul 11, 2019

View reviewed changes

f4ww4z merged commit d809cd7 into openmrs:master Jul 11, 2019

deepakpsad deleted the AC-625 branch July 13, 2019 14:46

Conversation

deepakpsad commented Jul 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of what I changed

Issue I worked on

Checklist: I completed these to help reviewers :)

Uh oh!

codecov-io commented Jul 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

f4ww4z Jul 8, 2019

Choose a reason for hiding this comment

Uh oh!

deepakpsad Jul 8, 2019

Choose a reason for hiding this comment

Uh oh!

f4ww4z Jul 9, 2019

Choose a reason for hiding this comment

Uh oh!

deepakpsad Jul 9, 2019

Choose a reason for hiding this comment

Uh oh!

f4ww4z Jul 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

deepakpsad commented Jul 8, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

deepakpsad commented Jul 8, 2019

Uh oh!

f4ww4z commented Jul 9, 2019

Uh oh!

deepakpsad commented Jul 9, 2019

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

f4ww4z Jul 10, 2019

Choose a reason for hiding this comment

Uh oh!

deepakpsad Jul 10, 2019

Choose a reason for hiding this comment

Uh oh!

deepakpsad commented Jul 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

f4ww4z left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

deepakpsad commented Jul 6, 2019 •

edited

Loading

codecov-io commented Jul 6, 2019 •

edited

Loading

f4ww4z Jul 10, 2019 •

edited

Loading

deepakpsad commented Jul 8, 2019 •

edited

Loading

deepakpsad commented Jul 10, 2019 •

edited

Loading