pangea
/
django-musician
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21 from RubenPX/PR-5 

format date using ES Format
This commit is contained in:
Santiago L 2022-03-17 22:35:14 +01:00 committed by GitHub
parent 49d49a3044 41f5493368
commit 9b4f2ba3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
musician/templates/musician/billing.html
View File

@ -27,7 +27,7 @@
{% for bill in object_list %} {% for bill in object_list %}
<tr> <tr>
<th scope="row">{{ bill.number }}</th> <th scope="row">{{ bill.number }}</th>
<td>{{ bill.created_on }}</td> <td>{{ bill.created_on|date:"SHORT_DATE_FORMAT" }}</td>
<td>{{ bill.type }}</td> <td>{{ bill.type }}</td>
<td>{{ bill.total|floatformat:2|localize }}€</td> <td>{{ bill.total|floatformat:2|localize }}€</td>
<td><a class="text-dark" href="{% url 'musician:bill-download' bill.id %}" target="_blank" rel="noopener noreferrer"><i class="fas fa-file-pdf"></i></a></td> <td><a class="text-dark" href="{% url 'musician:bill-download' bill.id %}" target="_blank" rel="noopener noreferrer"><i class="fas fa-file-pdf"></i></a></td>

3
musician/views.py
View File

@ -1,5 +1,6 @@
import logging import logging
import smtplib import smtplib
import datetime
from django.conf import settings from django.conf import settings
from django.contrib import messages from django.contrib import messages
@ -181,6 +182,8 @@ class BillingView(ServiceListView):
def get_queryset(self): def get_queryset(self):
qs = super().get_queryset() qs = super().get_queryset()
qs = sorted(qs, key=lambda x: x.created_on, reverse=True) qs = sorted(qs, key=lambda x: x.created_on, reverse=True)
for q in qs:
q.created_on = datetime.datetime.strptime(q.created_on, "%Y-%m-%d")
return qs return qs