starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-03-22 17:39:25 +01:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

Merge pull request #132 from eitchtee/dev

Browse Source 
refactor(currencies): remove currency's code reference in the UI
This commit is contained in:
Herculino Trotta
2025-02-03 00:28:53 -03:00
committed by GitHub
parent 06e9383689 7b95c806fb
commit 2f3207b1f6
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/apps/currencies/exchange_rates/__init__.py Normal file
View File

10
app/apps/currencies/views/exchange_rates.py
View File

@@ -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")

3
app/templates/cotton/ui/currency_card.html
View File

@@ -2,9 +2,6 @@
{% load i18n %}
<div class="col card shadow">
<div class="card-body">
<div class="tw-text-sm mb-2">
<span class="badge text-bg-primary">{{ currency.currency.code }}</span>
</div>
<h5 class="card-title">
{{ currency.currency.name }}
</h5>

4
app/templates/exchange_rates/fragments/table.html
View File

@@ -40,8 +40,8 @@
</div>
</td>
<td class="col-3">{{ exchange_rate.date|date:"SHORT_DATETIME_FORMAT" }}</td>
<td class="col-3"><span class="badge rounded-pill text-bg-secondary">{{ exchange_rate.from_currency.code }}</span> x <span class="badge rounded-pill text-bg-secondary">{{ exchange_rate.to_currency.code }}</span></td>
<td class="col-3">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%}</td>
<td class="col-3"><span class="badge rounded-pill text-bg-secondary">{{ exchange_rate.from_currency.name }}</span> x <span class="badge rounded-pill text-bg-secondary">{{ exchange_rate.to_currency.name }}</span></td>
<td class="col-3">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%}</td>
</tr>
{% endfor %}
</tbody>