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 #699, add diaper change count to card stats #737

Merged
merged 3 commits into from Dec 17, 2023

Conversation

josevh
Copy link
Contributor

@josevh josevh commented Dec 6, 2023

For #699, updated the diaper change card stats to indicate how many diaper changes took place.

I implemented the solution suggested in the issue and added (x changes) after the day label. Please advise if it is confusing or if a better alternative is preferred. I also haven't worked with Django translations in a while, please let me know if there are additional changes required on that end.

Screenshot

image

@josevh josevh force-pushed the diaperchange-change-count branch 2 times, most recently from d4f5816 to b853f6e Compare December 6, 2023 20:07
@josevh josevh marked this pull request as draft December 6, 2023 20:56
@josevh
Copy link
Contributor Author

josevh commented Dec 6, 2023

made a draft while I poke at tests

@josevh josevh marked this pull request as ready for review December 7, 2023 23:37
@josevh josevh force-pushed the diaperchange-change-count branch 2 times, most recently from 1936452 to e1253c5 Compare December 7, 2023 23:45
@josevh
Copy link
Contributor Author

josevh commented Dec 7, 2023

Seeing some errors and failures in the tests (run with Python 3.10.12). They appear unrelated. Run result: https://pastebin.com/m68hAESf

@cdubz
Copy link
Member

cdubz commented Dec 8, 2023

Hm that seems like an odd collection of fails. Will try to take a look at the base tests soon.

@cdubz
Copy link
Member

cdubz commented Dec 8, 2023

@josevh test fails were related to Django 5.x incompatibilities. I have updated master to lock Django to 4.x and created #738 to handle that upgrade. If you rebase or merge in master tests should pass.

@coveralls
Copy link

coveralls commented Dec 8, 2023

Coverage Status

coverage: 99.0% (-0.02%) from 99.018%
when pulling 0868782 on josevh:diaperchange-change-count
into 1063d39 on babybuddy:master.

@josevh
Copy link
Contributor Author

josevh commented Dec 8, 2023

@cdubz ty, looks like the rebase onto latest master did the trick for the PR checks. Locally, I still see some errors/failures (Python 3.10.12 and Django 4.2.8) (paste) but that may be expected.

@cdubz cdubz added the enhancement Feature requests or improvements to existing functionality label Dec 17, 2023
@cdubz cdubz added this to the 2.2.0 milestone Dec 17, 2023
@cdubz
Copy link
Member

cdubz commented Dec 17, 2023

Looks good -- thanks for contributing!

@cdubz cdubz merged commit 1ef0bb9 into babybuddy:master Dec 17, 2023
19 checks passed
@josevh josevh deleted the diaperchange-change-count branch December 19, 2023 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Feature requests or improvements to existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants