klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-06-26 13:15:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

date validity verification

Browse Source 
fixed template formatting
This commit is contained in:
Kenneth SOARES 2025-06-16 20:23:24 +02:00
parent 481c46e367
commit 4148dde109
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
counter/templates/counter/invoices_call.jinja
View File

@ -34,7 +34,7 @@
<td>{{ data.club.name }}</td> <td>{{ data.club.name }}</td>
<td>{{"%.2f"|format(data.sum)}} €</td> <td>{{"%.2f"|format(data.sum)}} €</td>
<td> <td>
{{ form[form.get_club_name(data.club.id)] }} {{ form[form.get_club_name(data.club.id)] }}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

22
counter/views/invoice.py
View File

@ -30,6 +30,19 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
template_name = "counter/invoices_call.jinja" template_name = "counter/invoices_call.jinja"
current_tab = "invoices_call" current_tab = "invoices_call"
def get(self, request, *args, **kwargs):
month_str = request.GET.get("month")
if month_str:
try:
start_date = datetime.strptime(month_str, "%Y-%m").date()
today = timezone.now().date().replace(day=1)
if start_date > today:
return redirect("counter:invoices_call")
except ValueError:
return redirect("counter:invoices_call")
return super().get(request, *args, **kwargs)
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
"""Add sums to the context.""" """Add sums to the context."""
kwargs = super().get_context_data(**kwargs) kwargs = super().get_context_data(**kwargs)
@ -37,7 +50,10 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
month_str = self.request.GET.get("month") month_str = self.request.GET.get("month")
if month_str: if month_str:
start_date = datetime.strptime(self.request.GET["month"], "%Y-%m") try:
start_date = datetime.strptime(self.request.GET["month"], "%Y-%m")
except ValueError:
return redirect("counter:invoices_call")
else: else:
start_date = datetime( start_date = datetime(
year=timezone.now().year, year=timezone.now().year,
@ -128,9 +144,7 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
date__month=start_date.month, date__month=start_date.month,
) )
clubs = Club.objects.annotate(has_selling=Exists(selling_subquery)).filter( clubs = Club.objects.filter(Exists(selling_subquery))
has_selling=True
)
form = InvoiceCallForm(request.POST, clubs=clubs, month=month_str) form = InvoiceCallForm(request.POST, clubs=clubs, month=month_str)