filter issue: #219

Merged
ismail merged 2 commits from frontend into main 2025-09-01 15:10:11 +03:00
5 changed files with 24 additions and 5 deletions

View File

@ -3190,6 +3190,7 @@ class CustomGroup(models.Model):
"notes",
"tasks",
"activity",
"additionalservices"
],
)
self.set_permissions(
@ -3305,6 +3306,7 @@ class CustomGroup(models.Model):
"activity",
"payment",
"vendor",
"additionalservices",
],
other_perms=[
"view_car",

View File

@ -13,7 +13,16 @@ from django.db.models import Case, Value, When, IntegerField
register = template.Library()
@register.filter
def is_negative(value):
"""
Checks if the given value is a negative number.
"""
try:
return float(value) < 0
except (ValueError, TypeError):
return False
@register.filter
def get_percentage(value, total):
try:

View File

@ -1,4 +1,5 @@
{% load i18n %}
{% load custom_filters %}
{% if request.is_dealer or request.is_manager or request.is_accountant %}
<h3 class="fw-bold mb-3">
{% blocktrans with start_date=start_date|date:"F j, Y" end_date=end_date|date:"F j, Y" %}
@ -302,9 +303,16 @@
<div class="card h-100 shadow-sm border-0">
<div class="card-body p-4">
<p class="text-uppercase text-muted fw-bold small mb-1">{% trans "Gross Profit" %}</p>
<h4 class="fw-bolder text-success mb-3">
{% if gross_profit|is_negative %}
<h4 class="fw-bolder text-danger mb-3">
{{ gross_profit|floatformat:2 }}<span class="icon-saudi_riyal"></span>
</h4>
</h4>
{% else %}
<h4 class="fw-bolder text-success mb-3">
{{ gross_profit|floatformat:2 }}<span class="icon-saudi_riyal"></span>
</h4>
{% endif %}
</div>
</div>
</div>

View File

@ -11,7 +11,7 @@
{% endif %}
{% endblock %}
{% block content %}
<main class="d-flex align-items-center justify-content-center min-vh-100 py-5">
<main class="d-flex align-items-center justify-content-center min-vh-80 py-5">
<div class="col-12 col-sm-10 col-md-8 col-lg-6 col-xl-5">
<div class="card shadow-lg border-0 rounded-4 overflow-hidden animate__animated animate__fadeInUp">
<div class="card-header bg-gradient py-4 border-0 rounded-top-4">

View File

@ -20,7 +20,7 @@
</a>
<a href="{% url 'group_list' request.dealer.slug %}"
class="btn btn-phoenix-secondary shadow-sm">
<i class="fa-solid fa-users me-2"></i>{% trans "Manage Groups" %}
<i class="fa-solid fa-users me-2"></i>{% trans "Manage Groups & Permissions" %}
</a>
</div>
{% endif %}