Skip to content

AC-622: Add, Edit,Delete Providers#611

Merged
f4ww4z merged 1 commit intoopenmrs:masterfrom
deepakpsad:AC-622
Jul 3, 2019
Merged

AC-622: Add, Edit,Delete Providers#611
f4ww4z merged 1 commit intoopenmrs:masterfrom
deepakpsad:AC-622

Conversation

@deepakpsad
Copy link
Contributor

@deepakpsad deepakpsad commented Jun 23, 2019 •
edited
Loading

Description of what I changed

Added Swipe Option menu to delete and edit providers.
Added FAB to add providers.
Created ProviderRepository with Callback.
Created Activity to add and edit providers.

Issue I worked on

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

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
Copy link

codecov-io commented Jun 23, 2019 •
edited
Loading

Codecov Report

Merging #611 into master will decrease coverage by 0.07%.
The diff coverage is 8.94%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #611      +/-   ##
==========================================
- Coverage   14.39%   14.31%   -0.08%     
==========================================
  Files         190      194       +4     
  Lines        8823     9025     +202     
  Branches      767      784      +17     
==========================================
+ Hits         1270     1292      +22     
- Misses       7474     7654     +180     
  Partials       79       79
Impacted Files Coverage Δ
...openmrs/mobile/utilities/ApplicationConstants.java 0% <0%> (ø) ⬆️
...mobile/activities/dashboard/DashboardFragment.java 0% <0%> (ø) ⬆️
...gerdashboard/ProviderManagerDashboardActivity.java 0% <0%> (ø)
...agerdashboard/addprovider/AddProviderActivity.java 0% <0%> (ø)
...agerdashboard/addprovider/AddProviderFragment.java 0% <0%> (ø)
...agerdashboard/addprovider/AddProviderContract.java 0% <0%> (ø)
...d/ProviderManagerDashboardRecyclerViewAdapter.java 0% <0%> (ø)
...gerdashboard/ProviderManagerDashboardFragment.java 0% <0%> (ø)
...penmrs/mobile/api/retrofit/ProviderRepository.java 18.75% <2.08%> (-49.68%) ⬇️
...erdashboard/ProviderManagerDashboardPresenter.java 38.7% <7.14%> (ø)
... and 7 more

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 2808b87...4e30368. Read the comment docs.

@deepakpsad
Copy link
Contributor Author

deepakpsad commented Jun 23, 2019

@f4ww4z, made the PR. Please review it.

f4ww4z
f4ww4z requested changes Jun 26, 2019
View reviewed changes
Copy link
Collaborator

@f4ww4z f4ww4z left a comment

Choose a reason for hiding this comment

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

Thanks @deepak140596 , please address my comments.

image

Also, what is meant by the toast message at the above image? Can you change it to a phrase?

f4ww4z
f4ww4z requested changes Jun 29, 2019
View reviewed changes
@deepakpsad
Copy link
Contributor Author

deepakpsad commented Jun 30, 2019 •
edited
Loading

@f4ww4z , now Edit , Delete and Adding Providers are working.

@deepakpsad deepakpsad changed the title [WIP] AC-622: Delete Providers AC-622: Add, Edit,Delete Providers Jun 30, 2019
@deepakpsad deepakpsad force-pushed the AC-622 branch 2 times, most recently from 099cb3e to 0789a2a Compare July 1, 2019 07:14
f4ww4z
f4ww4z requested changes Jul 2, 2019
View reviewed changes
Copy link
Collaborator

@f4ww4z f4ww4z left a comment

Choose a reason for hiding this comment

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

The UI for all of this looks great! @deepak140596 do address all my comments:

  • For AddProvider screen, it needs to be following the MVP pattern still, don't put all the code into 1 big class.
  • To sort these screens out (the 'provider manager dashboard' and the 'add provider' screens), I suggest you rename the providermanager to providermanagerdashboard and all the classes inside it to follow the ProviderManagerDashboard name. Then, create the addprovider package and work on the 'add provider' screen inside it.
  • Change provider_manager in strings.xml to Provider Manager.

...-client/src/main/java/org/openmrs/mobile/activities/providermanager/AddProviderActivity.java Outdated
identifierTIL = findViewById(R.id.add_provider_identifier_til);

if (editProvider != null) {
String displayName = editProvider.getPerson().getDisplay();
Copy link
Collaborator

@f4ww4z f4ww4z Jul 2, 2019

Choose a reason for hiding this comment

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

Did you try accessing the given, middle and family names using getNames ?

Copy link
Contributor Author

@deepakpsad deepakpsad Jul 2, 2019

Choose a reason for hiding this comment

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

Yes. It always shows the size as 0. I think there is some problem in the backend where the names are store in Display and are lost in the List variable.

Copy link
Collaborator

@f4ww4z f4ww4z Jul 3, 2019

Choose a reason for hiding this comment

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

@deepak140596 Can you investigate this and file a new issue?

...-client/src/main/java/org/openmrs/mobile/activities/providermanager/AddProviderActivity.java Outdated
String displayName = editProvider.getPerson().getDisplay();

firstNameEt.setText(displayName.substring(0, displayName.indexOf(' ')));
lastNameEt.setText(displayName.substring(displayName.lastIndexOf(' ') + 1));
Copy link
Collaborator

@f4ww4z f4ww4z Jul 2, 2019

Choose a reason for hiding this comment

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

What is being done here? This complexity is too high.

Copy link
Contributor Author

@deepakpsad deepakpsad Jul 2, 2019

Choose a reason for hiding this comment

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

It extracts the first and last names of the Provider. I have broken this line into two parts.

...-client/src/main/java/org/openmrs/mobile/activities/providermanager/AddProviderActivity.java Outdated
}


Person createPerson() {
Copy link
Collaborator

@f4ww4z f4ww4z Jul 2, 2019

Choose a reason for hiding this comment

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

Why did you choose to create this method? You can possibly rename this to createPersonFromUserInput.

@f4ww4z
Copy link
Collaborator

f4ww4z commented Jul 2, 2019 •
edited
Loading

1 more thing: make sure to add tests to the Presenter of 'add providers' screen, at least.

f4ww4z
f4ww4z approved these changes Jul 3, 2019
View reviewed changes
Copy link
Collaborator

@f4ww4z f4ww4z left a comment

Choose a reason for hiding this comment

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

Looks good @deepak140596 !

@f4ww4z f4ww4z merged commit 544c0c4 into openmrs:master Jul 3, 2019
@deepakpsad deepakpsad deleted the AC-622 branch July 4, 2019 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@f4ww4z f4ww4z f4ww4z approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@deepakpsad @codecov-io @f4ww4z