From 9b4bbef5bf1a5e7b1330fa38b0d6972ec364ddd4 Mon Sep 17 00:00:00 2001 From: bugbountyguy Date: Fri, 4 Mar 2022 10:14:57 -0600 Subject: [PATCH] Change reading to entry and other PR feedback --- core/templates/core/pumping_confirm_delete.html | 2 +- core/templates/core/pumping_form.html | 4 ++-- core/tests/import/{breastpump.csv => pumping.csv} | 0 core/views.py | 4 ++-- docs/user-guide/getting-started.md | 1 - reports/graphs/pumping_amounts.py | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) rename core/tests/import/{breastpump.csv => pumping.csv} (100%) diff --git a/core/templates/core/pumping_confirm_delete.html b/core/templates/core/pumping_confirm_delete.html index 2b5aa6d3..7be7d42c 100644 --- a/core/templates/core/pumping_confirm_delete.html +++ b/core/templates/core/pumping_confirm_delete.html @@ -1,7 +1,7 @@ {% extends 'babybuddy/page.html' %} {% load i18n widget_tweaks %} -{% block title %}{% trans "Delete a Pumping Reading" %}{% endblock %} +{% block title %}{% trans "Delete a Pumping Entry" %}{% endblock %} {% block breadcrumbs %} diff --git a/core/templates/core/pumping_form.html b/core/templates/core/pumping_form.html index c2a4ce66..f25c9620 100644 --- a/core/templates/core/pumping_form.html +++ b/core/templates/core/pumping_form.html @@ -5,7 +5,7 @@ {% if object %} {{ object }} {% else %} - {% trans "Add a Pumping Reading" %} + {% trans "Add a Pumping Entry" %} {% endif %} {% endblock %} @@ -14,7 +14,7 @@ {% if object %} {% else %} - + {% endif %} {% endblock %} diff --git a/core/tests/import/breastpump.csv b/core/tests/import/pumping.csv similarity index 100% rename from core/tests/import/breastpump.csv rename to core/tests/import/pumping.csv diff --git a/core/views.py b/core/views.py index 1ab22ad9..6ac30704 100644 --- a/core/views.py +++ b/core/views.py @@ -134,7 +134,7 @@ class PumpingAdd(CoreAddView): permission_required = ("core.add_pumping",) form_class = forms.PumpingForm success_url = reverse_lazy("core:pumping-list") - success_message = _("%(model)s reading added!") + success_message = _("%(model)s entry added!") class PumpingUpdate(CoreUpdateView): @@ -142,7 +142,7 @@ class PumpingUpdate(CoreUpdateView): permission_required = ("core.change_pumping",) form_class = forms.PumpingForm success_url = reverse_lazy("core:pumping-list") - success_message = _("%(model)s reading for %(child)s updated.") + success_message = _("%(model)s entry for %(child)s updated.") class PumpingDelete(CoreDeleteView): diff --git a/docs/user-guide/getting-started.md b/docs/user-guide/getting-started.md index e71f5e30..4d0aebad 100644 --- a/docs/user-guide/getting-started.md +++ b/docs/user-guide/getting-started.md @@ -45,7 +45,6 @@ ability to edit any entry. The Measurements menu provides the option to view and track your baby's measurements of temperature, weight, height, head circumference and BMI. -This section also includes the mother's measurements for pumping pumped. Selecting any of the measurements will open that specific page with all related measurements listed. diff --git a/reports/graphs/pumping_amounts.py b/reports/graphs/pumping_amounts.py index 0a91c1a5..29d02521 100644 --- a/reports/graphs/pumping_amounts.py +++ b/reports/graphs/pumping_amounts.py @@ -16,7 +16,7 @@ def pumping_amounts(objects): """ objects = objects.order_by("-time") - trace = go.Scatter( + trace = go.Bar( name=_("Pumping"), x=list(objects.values_list("time", flat=True)), y=list(objects.values_list("amount", flat=True)),