From 14128adc96cf4dfcd0792e803207143ae17d913e Mon Sep 17 00:00:00 2001 From: Silvio Heinze Date: Thu, 30 Jan 2025 12:29:02 +0100 Subject: [PATCH 1/2] change cards in dashboard --- app/templates/account/dashboard.html | 44 +++++----------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/app/templates/account/dashboard.html b/app/templates/account/dashboard.html index 3131f04..6c38432 100644 --- a/app/templates/account/dashboard.html +++ b/app/templates/account/dashboard.html @@ -1,6 +1,7 @@ {% extends "_base.html" %} {% load i18n %} {% load static %} +{% load humanize %} {% block title %}{% trans "Dashboard" %}{% endblock title %} @@ -10,8 +11,8 @@

{% trans "Welcome," %} {{ user.username }}

- -
+ +
@@ -24,45 +25,14 @@
- -
+ +
- {% trans "Aaaa" %} + {% trans " My Measurements" %}
-

{{ member_organizations|length }}

- - {% trans "View Aaaa" %} - -
-
-
- -
-
-
-
- {% trans "Measurements" %} -
-

3764

- - {% trans "Manage Data" %} - -
-
-
- -
-
-
-
- {% trans "Days measured" %} -
-

5

- - {% trans "View Timeline" %} - +

{{ user.measurements.count|intcomma }}

From 22b00bb2c6e05111c5cf9c210fc25bb2a782791f Mon Sep 17 00:00:00 2001 From: Silvio Heinze Date: Thu, 30 Jan 2025 12:29:14 +0100 Subject: [PATCH 2/2] format measurement number in settings --- app/templates/account/settings.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/templates/account/settings.html b/app/templates/account/settings.html index 48389f7..3c7d90b 100644 --- a/app/templates/account/settings.html +++ b/app/templates/account/settings.html @@ -1,6 +1,7 @@ {% extends "_base.html" %} {% load i18n %} {% load static %} +{% load humanize %} {% block title %}{% trans "Settings" %}{% endblock title %} @@ -11,7 +12,7 @@

{% trans "Change Password" %}

{% trans "Change Password" %}

{% trans "Delete Data" %}

-

Your account is connected to {{ user.measurements.count }} measurements. Do you really want to delete these?

+

Your account is connected to {{ user.measurements.count|intcomma }} measurements. Do you really want to delete these?

{% trans "Delete Data" %}