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

AC-809 Create allergy based on server configuration #796

Merged
merged 10 commits into from
Aug 9, 2020

Conversation

rishabh-997
Copy link
Collaborator

Description of what I changed

Issue I worked on

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

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.

@rishabh-997 rishabh-997 added the draft Not ready for review label Aug 4, 2020
@rishabh-997
Copy link
Collaborator Author

I am creating PR to keep a check on Travis errors for each commit. Will finalize this PR by tomorrow morning

@rishabh-997
Copy link
Collaborator Author

Meanwhile UI. I am reading blogs on how to create [chips](https://developer.android.com/reference/com/google/android/material/chip/Chip)

WhatsApp Image 2020-08-04 at 12 06 15 PM

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.

@rishabh-997 To make this feature easier to see, you should modify the floating action button on the bottom right so that when going to the allergy tab it is changed to a + button for creating a new allergy. See this animation for example.

@codecov-commenter
Copy link

codecov-commenter commented Aug 4, 2020

Codecov Report

Merging #796 into master will decrease coverage by 0.42%.
The diff coverage is 0.58%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #796      +/-   ##
==========================================
- Coverage   13.95%   13.52%   -0.43%     
==========================================
  Files         229      238       +9     
  Lines        9329     9632     +303     
  Branches      903      924      +21     
==========================================
+ Hits         1302     1303       +1     
- Misses       7921     8223     +302     
  Partials      106      106              
Impacted Files Coverage Δ
...ivities/addeditallergy/AddEditAllergyActivity.java 0.00% <0.00%> (ø)
...ivities/addeditallergy/AddEditAllergyFragment.java 0.00% <0.00%> (ø)
...vities/addeditallergy/AddEditAllergyPresenter.java 0.00% <0.00%> (ø)
...ivities/addeditpatient/AddEditPatientFragment.java 0.00% <0.00%> (ø)
...s/mobile/activities/dialog/CustomPickerDialog.java 0.00% <0.00%> (ø)
...ies/patientdashboard/PatientDashboardActivity.java 0.00% <0.00%> (ø)
...enmrs/mobile/api/repository/AllergyRepository.java 25.64% <0.00%> (-14.36%) ⬇️
...obile/api/workers/allergy/DeleteAllergyWorker.java 0.00% <0.00%> (ø)
...n/java/org/openmrs/mobile/models/AllergenCreate.kt 0.00% <0.00%> (ø)
...in/java/org/openmrs/mobile/models/AllergyCreate.kt 0.00% <0.00%> (ø)
... and 15 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 423695b...5a43555. Read the comment docs.

@rishabh-997
Copy link
Collaborator Author

You can reach the activity through the floating action button in the dashboard.

WhatsApp Image 2020-08-05 at 3 03 30 AM

@rishabh-997 rishabh-997 removed the draft Not ready for review label Aug 5, 2020
@rishabh-997
Copy link
Collaborator Author

  1. No Duplicates can be added in chips
  2. Scroll view added in case many chips are added

WhatsApp Image 2020-08-08 at 2 08 55 PM

alertDialog = alertDialogBuilder.create();
alertDialog.show();
} else {
ToastUtil.notify("Under Progress");
Copy link
Collaborator Author

@rishabh-997 rishabh-997 Aug 8, 2020

Choose a reason for hiding this comment

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

Not added in strings.xml or ApplicationConstants.kt since I will remove it in the update-allergy PR.

@rishabh-997 rishabh-997 requested a review from f4ww4z August 8, 2020 08:59
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.

@f4ww4z f4ww4z merged commit 7d9c817 into openmrs:master Aug 9, 2020
@rishabh-997
Copy link
Collaborator Author

I think there has been some error while mierging as lastest commit history shows all 10 commits I made in this PR... @f4ww4z sir

@rishabh-997 rishabh-997 deleted the AC-809-addAllergy branch August 19, 2020 18:41
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.

3 participants