tpokorra/walletmonitor
1
0
Fork 0
Code Issues 5 Pull Requests Actions Activity

drop old fields, make use of new fields.

Browse Source 
display decimal with 0 properly, non scientific
This commit is contained in:
timo_admin
2021-05-11 20:09:52 +02:00
parent cd68e46b91
commit b356d304b2
6 changed files with 110 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/transactions/templates/add.html
+19 -5
View File
@@ -28,6 +28,13 @@
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Transaction Type:</label>
<div class="col-sm-4">
{{ form.transaction_type }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Trade ID:</label>
<div class="col-sm-4">
@@ -43,16 +50,16 @@
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Amount before fee:</label>
<label class="col-sm-2 col-form-label">Crypto Amount:</label>
<div class="col-sm-4">
{{ form.amount_before_fee }}
{{ form.crypto_amount }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Amount after fee:</label>
<label class="col-sm-2 col-form-label">Crypto fee:</label>
<div class="col-sm-4">
{{ form.amount_after_fee }}
{{ form.crypto_fee }}
</div>
</div>
@@ -73,7 +80,14 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">Fiat Amount:</label>
<div class="col-sm-4">
{{ form.amount }}
{{ form.fiat_amount }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Fiat Fee:</label>
<div class="col-sm-4">
{{ form.fiat_fee }}
</div>
</div>
apps/transactions/templates/edit.html
+21 -7
View File
@@ -29,24 +29,31 @@
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Transaction Type:</label>
<div class="col-sm-4">
{{ form.transaction_type }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Crypto Currency:</label>
<div class="col-sm-4">
{{ form.crypto_currency }}
{{ form.crypto_currency }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Amount before fee:</label>
<label class="col-sm-2 col-form-label">Crypto Amount:</label>
<div class="col-sm-4">
{{ form.amount_before_fee }}
{{ form.crypto_amount }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Amount after fee:</label>
<label class="col-sm-2 col-form-label">Crypto fee:</label>
<div class="col-sm-4">
{{ form.amount_after_fee }}
{{ form.crypto_fee }}
</div>
</div>
@@ -67,14 +74,21 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">Fiat Amount:</label>
<div class="col-sm-4">
{{ form.amount }}
{{ form.fiat_amount }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">Fiat Fee:</label>
<div class="col-sm-4">
{{ form.fiat_fee }}
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">{{ form.date_valid.label }}:</label>
<div class="col-sm-4">
{{ form.date_valid }}
{{ form.date_valid }}
</div>
</div>
apps/transactions/templates/show.html
+10 -4
View File
@@ -22,13 +22,19 @@
{% for transaction in transactions %}
<tr>
<td>{{ transaction.date_valid }}</td>
<td>{{ transaction.amount_before_fee|floatformat:3 }} {{ transaction.crypto_currency }}</td>
<td>{{ transaction.amount|formatcurrency }} {{ transaction.fiat_currency }}</td>
<td>{% if transaction.amount < 0 %}
<td>{{ transaction.crypto_amount|floatformat:3 }}
{% if transaction.crypto_fee > 0 %}Fee: {{ transaction.crypto_fee|floatformat:3 }}{% endif %}
{{ transaction.crypto_currency }}
</td>
<td>{{ transaction.fiat_amount|formatcurrency }}
{% if transaction.fiat_fee > 0 %}Fee: {{ transaction.fiat_fee|floatformat:2 }}{% endif %}
{{ transaction.fiat_currency }}
</td>
<td>{% if transaction.transaction_type == 'S' %}
{{ transaction.exchange_rate|formatcurrency }} {{ transaction.crypto_currency }}/{{ transaction.fiat_currency }}
{% endif %}
</td>
<td>{% if transaction.amount > 0 %}
<td>{% if transaction.transaction_type == 'B' %}
{{ transaction.exchange_rate|formatcurrency }} {{ transaction.crypto_currency }}/{{ transaction.fiat_currency }}
{% endif %}
</td>