diff --git a/app/apps/currencies/exchange_rates/__init__.py b/app/apps/currencies/exchange_rates/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/apps/currencies/views/exchange_rates.py b/app/apps/currencies/views/exchange_rates.py index dc43de5..460b42a 100644 --- a/app/apps/currencies/views/exchange_rates.py +++ b/app/apps/currencies/views/exchange_rates.py @@ -27,17 +27,17 @@ def exchange_rates_index(request): @require_http_methods(["GET"]) def exchange_rates_list(request): pairings = ( - ExchangeRate.objects.values("from_currency__code", "to_currency__code") + ExchangeRate.objects.values("from_currency__name", "to_currency__name") .distinct() .annotate( pair=Concat( - "from_currency__code", + "from_currency__name", Value(" x "), - "to_currency__code", + "to_currency__name", output_field=CharField(), ) ) - .values_list("pair", "from_currency__code", "to_currency__code") + .values_list("pair", "from_currency__name", "to_currency__name") ) return render( @@ -56,7 +56,7 @@ def exchange_rates_list_pair(request): if from_currency and to_currency: exchange_rates = ExchangeRate.objects.filter( - from_currency__code=from_currency, to_currency__code=to_currency + from_currency__name=from_currency, to_currency__name=to_currency ).order_by("-date") else: exchange_rates = ExchangeRate.objects.all().order_by("-date") diff --git a/app/templates/cotton/ui/currency_card.html b/app/templates/cotton/ui/currency_card.html index bd39156..e748883 100644 --- a/app/templates/cotton/ui/currency_card.html +++ b/app/templates/cotton/ui/currency_card.html @@ -2,9 +2,6 @@ {% load i18n %}
-
- {{ currency.currency.code }} -
{{ currency.currency.name }}
diff --git a/app/templates/exchange_rates/fragments/table.html b/app/templates/exchange_rates/fragments/table.html index 271b6aa..25250a8 100644 --- a/app/templates/exchange_rates/fragments/table.html +++ b/app/templates/exchange_rates/fragments/table.html @@ -40,8 +40,8 @@
{{ exchange_rate.date|date:"SHORT_DATETIME_FORMAT" }} - {{ exchange_rate.from_currency.code }} x {{ exchange_rate.to_currency.code }} - 1 {{ exchange_rate.from_currency.code }} ≅ {% currency_display amount=exchange_rate.rate prefix=exchange_rate.to_currency.prefix suffix=exchange_rate.to_currency.suffix decimal_places=exchange_rate.to_currency.decimal_places%} + {{ exchange_rate.from_currency.name }} x {{ exchange_rate.to_currency.name }} + 1 {{ exchange_rate.from_currency.name }} ≅ {% currency_display amount=exchange_rate.rate prefix=exchange_rate.to_currency.prefix suffix=exchange_rate.to_currency.suffix decimal_places=exchange_rate.to_currency.decimal_places%} {% endfor %}