From e5884b2b2c101f69f3fc0848d79d33c1441d355e Mon Sep 17 00:00:00 2001 From: ismail <=> Date: Thu, 22 May 2025 19:13:40 +0300 Subject: [PATCH] add some linting and formating ,+ some fixes --- inventory/views.py | 12 +- templates/inventory/add_colors.html | 35 +- templates/inventory/add_custom_card.html | 7 +- templates/inventory/car_confirm_delete.html | 5 +- templates/inventory/car_detail.html | 994 +++++++++--------- templates/inventory/car_edit.html | 41 +- templates/inventory/car_finance_form.html | 45 +- templates/inventory/car_form.html | 560 +++++----- .../inventory/car_form_qabl alfalsafa.html | 611 +++++------ templates/inventory/car_history.html | 90 +- templates/inventory/car_inventory.html | 118 ++- templates/inventory/car_list.html | 103 +- templates/inventory/car_list_table.html | 12 +- templates/inventory/car_list_view.html | 405 +++---- templates/inventory/car_location_form.html | 7 +- .../inventory/car_registration_form.html | 7 +- templates/inventory/car_transfer_form.html | 7 +- templates/inventory/cars_list_api.html | 35 +- templates/inventory/color_palette.html | 20 +- templates/inventory/colors.html | 441 ++++++-- templates/inventory/inventory_stats.html | 166 ++- templates/inventory/reserve_car.html | 19 +- templates/inventory/scan_vin.html | 20 +- templates/inventory/transfer_car.html | 17 +- templates/inventory/transfer_details.html | 227 ++-- templates/inventory/transfer_preview.html | 297 +++--- 26 files changed, 2366 insertions(+), 1935 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index a99d71d2..f2eabaf4 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -558,7 +558,7 @@ class CarCreateView(LoginRequiredMixin, PermissionRequiredMixin, CreateView): def get_form(self, form_class=None): form = super().get_form(form_class) dealer = get_user_type(self.request) - form.fields["vendor"].queryset = dealer.vendors.all() + form.fields["vendor"].queryset = dealer.vendors.filter(active=True) return form def get_success_url(self): @@ -874,7 +874,7 @@ class CarInventory(LoginRequiredMixin, PermissionRequiredMixin, ListView): home_label = _("inventory") template_name = "inventory/car_inventory.html" context_object_name = "cars" - paginate_by = 10 + paginate_by = 20 ordering = ["receiving_date"] permission_required = ["inventory.view_car"] @@ -969,7 +969,7 @@ class CarListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): model = models.Car template_name = "inventory/car_list_view.html" context_object_name = "cars" - paginate_by = 20 + paginate_by = 30 permission_required = "inventory.view_car" def get_context_data(self, **kwargs): @@ -4672,14 +4672,14 @@ class LeadListView(LoginRequiredMixin, PermissionRequiredMixin, ListView): query = self.request.GET.get("q") dealer = get_user_type(self.request) qs = models.Lead.objects.filter(dealer=dealer) + if query: + qs = apply_search_filters(qs, query) if self.request.is_dealer: return qs staffmember = getattr(self.request.user, "staffmember", None) if staffmember and getattr(staffmember, "staff", None): qs = qs.filter(staff=staffmember.staff) - if query: - return apply_search_filters(qs, query) - return qs + return models.Lead.objects.none() class LeadDetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView): diff --git a/templates/inventory/add_colors.html b/templates/inventory/add_colors.html index bf8d9949..7583c645 100644 --- a/templates/inventory/add_colors.html +++ b/templates/inventory/add_colors.html @@ -3,12 +3,12 @@ {% block content %}
{% trans "Add Colors" %}
-

{% trans "Select exterior and interior colors for" %} {{ car.id_car_make.get_local_name }} {{ car.id_car_model.get_local_name }}

- +

+ {% trans "Select exterior and interior colors for" %} {{ car.id_car_make.get_local_name }} {{ car.id_car_model.get_local_name }} +

{% csrf_token %} - - +

{% trans 'Exterior Colors' %}

{% for color in form.fields.exterior.queryset %} @@ -19,7 +19,8 @@ type="radio" name="exterior" value="{{ color.id }}"> -
+
{{ color.get_local_name }}
@@ -28,8 +29,7 @@
{% endfor %} - - +

{% trans 'Interior Colors' %}

{% for color in form.fields.interior.queryset %}
@@ -39,7 +39,8 @@ type="radio" name="interior" value="{{ color.id }}"> -
+
{{ color.get_local_name }}
@@ -49,17 +50,13 @@
{% endfor %}
- - + {% comment %}
{% trans "Cancel" %}
{% endcomment %} - - - {% comment %}
@@ -68,16 +65,14 @@
{% endcomment %} -
- - {% trans "Cancel" %} + + {% trans "Cancel" %}
- -
- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/inventory/add_custom_card.html b/templates/inventory/add_custom_card.html index 3865cf40..20a82851 100644 --- a/templates/inventory/add_custom_card.html +++ b/templates/inventory/add_custom_card.html @@ -1,7 +1,8 @@ {% load i18n %} {% load crispy_forms_filters %} - -
+ {% csrf_token %} {{ form|crispy }}
@@ -17,4 +18,4 @@ {% trans 'Save' %}
-
\ No newline at end of file + diff --git a/templates/inventory/car_confirm_delete.html b/templates/inventory/car_confirm_delete.html index 9e2c123a..fb3dfa77 100644 --- a/templates/inventory/car_confirm_delete.html +++ b/templates/inventory/car_confirm_delete.html @@ -1,16 +1,13 @@ {% extends 'base.html' %} {% load i18n %} - {% block title %}Delete Car{% endblock %} - {% block content %}

Delete Car

Are you sure you want to delete the car "{{ car }}"?

-
{% csrf_token %} {% trans 'Cancel' %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index 859cc61e..3637fe11 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -2,7 +2,7 @@ {% load i18n static custom_filters %} {% block title %}{{ _("Car Details") }}{% endblock %} {% block customCSS %} - + {% endblock customCSS %} - {% block content %} - {% if not car.ready %} - - {% endif %} - {% if car.get_transfer.status == "draft" %} - - {% endif %} - {% if car.get_transfer and car.get_transfer.status == "approved" %} - - {% endif %} - {% if car.is_reserved %} - - {% endif %} - - -
-
-
-
-

{% trans 'Car Details' %}

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if car.vendor %} - - - - - {% endif %} - - - - - - - - - {% if car.custom_cards %} - - - - - - - - - {% else %} - - - - - {% endif %} - {% if car.registrations %} - - - - - - - - - {% else %} - - - - - - {% endif %} - - - - -
{% trans "VIN" %}{{ car.vin }}
{% trans "year"|capfirst %}{{ car.year }}
{% trans "make"|capfirst %}{{ car.id_car_make.get_local_name }}
{% trans "model"|capfirst %}{{ car.id_car_model.get_local_name }}
{% trans "series"|capfirst %}{{ car.id_car_serie.name }}
{% trans "trim"|capfirst %}{{ car.id_car_trim.name }}
{% trans "Status"|capfirst %}{{ car.get_status_display }}
{% trans "Stock Type"|capfirst %}{{ car.get_stock_type_display }}
{% trans "Mileage"|capfirst %}{{ car.mileage }}
{% trans "Receiving Date"|capfirst %}{{ car.receiving_date|timesince }}
{% trans "Vendor"|capfirst %}{{ car.vendor.name }}
{% trans "Remarks"|capfirst %}{{ car.remarks }}
{% trans 'specifications'|capfirst %} - -
{% trans "Custom Number"|capfirst %}{{ car.custom_cards.custom_number }}
{% trans "Custom Date"|capfirst %}{{ car.custom_cards.custom_date|date }}
{% trans "Custom Card" %} - -
{% trans "Registration"|capfirst %}{{ car.registrations.plate_number }} | {{ car.registrations.text1 }} {{ car.registrations.text2 }} {{ car.registrations.text3 }} - -
{% trans "Registration Date"|capfirst %}{{ car.registrations.registration_date|date }}
{% trans "Registration" %} - -
{% trans 'Location'|capfirst %} - {% if car.finances and not car.get_transfer %} - {% if car.location %} {% if car.location.is_owner_showroom %} {% trans 'Our Showroom' %} {% else %} {{ car.location.showroom.get_local_name }} {% endif %} - - {% trans "transfer"|capfirst %} - - {% else %} {% trans "No location available." %} - - {% trans "Add" %} - - {% endif %} - {% endif %} -
-
-
- {% if not car.get_transfer %} - {% if perms.inventory.change_car %} - {% trans "Edit" %} - - {% trans "Sell to another dealer"|capfirst %} - - {% endif %} - {% else %} - {% trans "Cannot Edit, Car in Transfer." %} - {% endif %} -
-
+ {% if not car.ready %} + -
-
-
-

{% trans 'Financial Details' %}

-
- -
- - {% if car.finances %} - - {% if perms.inventory.view_carfinance %} - - - {% endif %} - - - - - - - - - - - - - - {% if car.finances.additional_services.first.pk %} - {% for service in car.finances.additional_services.all %} - - - - - {% endfor %} - {% endif %} - - - - - - - - - - - - {% endif %} -
{% trans "Cost Price"|capfirst %}{{ car.finances.cost_price|floatformat:2 }}
{% trans "Selling Price"|capfirst %}{{ car.finances.selling_price|floatformat:2 }}
{% trans "Discount Amount"|capfirst %}{{ car.finances.discount_amount|floatformat:2 }} -
{% trans "Additional Fee"|capfirst %}
{{service.name}}{{ service.price_|floatformat:2 }}
{% trans "VAT Amount"|capfirst %}{{ car.finances.vat_amount|floatformat:2 }}
{% trans "Total"|capfirst %}{{ car.finances.total_vat|floatformat:2 }}
- {% if not car.get_transfer %} - - {% trans "Edit" %} - - {% else %} - {% trans "Cannot Edit, Car in Transfer." %} - {% endif %} - {% else %} -

{% trans "No finance details available." %}

- {% if perms.inventory.add_carfinance %} - - {% trans "Add" %} - - {% endif %} -
-
-
-
-
-

{% trans 'Colors Details' %}

-
-
- - {% if car.colors %} - - - - - - - - - - - - - {% else %} - - - - - - - {% endif %} -
{% trans 'Exterior' %} - {{ car.colors.exterior.get_local_name }} - -
-
{% trans 'Interior' %} - {{ car.colors.interior.get_local_name }} - -
-
- {% trans "No colors available for this car." %} -
- {% if perms.inventory.change_carcolors %} - - {% trans "Add" %} - - {% endif %} -
-
-
-
- {% if car.status != 'transfer' %} -
-

{% trans 'Reservations Details' %}

-
-
- - {% if car.is_reserved %} - - - - - - - - - {% for reservation in car.reservations.all %} - - - - - - {% endfor %} {% else %} - - - - - {% endif %} -
{% trans "Reserved By" %}{% trans "Expires At" %}{% trans 'Actions' %}
{{ reservation.reserved_by.dealer }}{{ reservation.reserved_until }} - {% if reservation.is_active %} -
- {% csrf_token %} -
- - -
-
- {% else %} - - {% trans "Expired" %} - - {% endif %} -
- {% if perms.inventory.change_carreservation %} - - {% endif %} -
-
-
-
- {% endif %} - - {% if car.status == 'transfer' and car.get_transfer %} -
-

{% trans 'Transfer Details' %}

-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Action" %}{% trans "Status" %}{% trans "From Showroom" %}{% trans "To Showroom" %}{% trans 'Date' %}
Transfer - {% if car.get_transfer.status == "draft" %} - - waiting for approval - - {% elif car.get_transfer.status == "approved" %} - - waiting for dealer acceptance - - {% endif %} - {{ car.get_transfer.from_dealer|title }}{{ car.get_transfer.to_dealer|title }}{{ car.get_transfer.transfer_date|date:"Y-m-d" }} - {% if car.get_transfer.status == "draft" %} - Approve - {% endif %} - - Cancel -
-
-
-
- {% endif %} -
-
- {% if car.status == 'sold' %} - {% endif %} -
- - - -#eeeeee
227
-#20b2aa
221
-#cccccc
218
-#f08080
217 -#333333
216 -#ffc3a0
210 -#c0d6e4
209 -#66cdaa
206 -#ff00ff
202 -#ff7f50
198 -#ff6666
196 -#cbbeb5
193 -#468499
189 -#ffdab9
189 -#008000
177 -#b4eeb4
176 -#afeeee
176 -#00ced1
174 -#000080
172 -#990000
167 -#f6546a
166 -#660066
165 -#8a2be2
162 -#f5f5f5
162 -#0e2f44
161 -#b6fcd5
161 -#696969
161 -#daa520
161 -#f5f5dc
159 -#6897bb
158 -#8b0000
152 -#808080
151 -#088da5
147 -#ccff00
146 -#ff1493
140 -#ffff66
140 -#81d8d0
140 -#dddddd
136 -#2acaea
135 -#ff4040
135 -#0a75ad
134 -#a0db8e
132 -#101010
129 -#420420
128 -#66cccc
125 -#999999
122 -#794044
113 -#00ff7f
112 -#cc0000
111 - - - +#ffc0cb +
+707 + +#ffffff +
+607 + +#ffe4e1 +
+559 + +#008080 +
+542 + +#ff0000 +
+441 + +#e6e6fa +
+434 + +#ffd700 +
+396 + +#00ffff +
+361 + +#ffa500 +
+342 + +#0000ff +
+342 + +#c6e2ff +
+333 + +#b0e0e6 +
+321 + +#40e0d0 +
+320 + +#d3ffce +
+320 + +#ff7373 +
+318 + +#f0f8ff +
+312 + +#666666 +
+282 + +#faebd7 +
+281 + +#bada55 +
+271 + +#003366 +
+268 + +#fa8072 +
+265 + +#ffb6c1 +
+263 + +#ffff00 +
+260 + +#c0c0c0 +
+254 + +#800000 +
+248 + +#800080 +
+243 + +#00ff00 +
+242 + +#c39797 +
+239 + +#7fffd4 +
+230 + +#fff68f +
+228 + +#eeeeee +
+227 + +#20b2aa +
+221 + +#cccccc +
+218 + +#f08080 +
+217 + +#333333 +
+216 + +#ffc3a0 +
+210 + +#c0d6e4 +
+209 + +#66cdaa +
+206 + +#ff00ff +
+202 + +#ff7f50 +
+198 + +#ff6666 +
+196 + +#cbbeb5 +
+193 + +#468499 +
+189 + +#ffdab9 +
+189 + +#008000 +
+177 + +#b4eeb4 +
+176 + +#afeeee +
+176 + +#00ced1 +
+174 + +#000080 +
+172 + +#990000 +
+167 + +#f6546a +
+166 + +#660066 +
+165 + +#8a2be2 +
+162 + +#f5f5f5 +
+162 + +#0e2f44 +
+161 + +#b6fcd5 +
+161 + +#696969 +
+161 + +#daa520 +
+161 + +#f5f5dc +
+159 + +#6897bb +
+158 + +#8b0000 +
+152 + +#808080 +
+151 + +#088da5 +
+147 + +#ccff00 +
+146 + +#ff1493 +
+140 + +#ffff66 +
+140 + +#81d8d0 +
+140 + +#dddddd +
+136 + +#2acaea +
+135 + +#ff4040 +
+135 + +#0a75ad +
+134 + +#a0db8e +
+132 + +#101010 +
+129 + +#420420 +
+128 + +#66cccc +
+125 + +#999999 +
+122 + +#794044 +
+113 + +#00ff7f +
+112 + +#cc0000 +
+111 + diff --git a/templates/inventory/inventory_stats.html b/templates/inventory/inventory_stats.html index 637ad114..b94b8881 100644 --- a/templates/inventory/inventory_stats.html +++ b/templates/inventory/inventory_stats.html @@ -1,92 +1,90 @@ {% extends "base.html" %} {% load i18n static %} - {% block title %} - {% trans "inventory"|capfirst %} + {% trans "inventory"|capfirst %} {% endblock %} - {% block content %} - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
- {% for make in inventory.makes %} -
-

- - -

-
-
-

{% trans "models"|capfirst %}

-
    - {% for model in make.models %} -
  • - {{ model.model_name }}:  - {{ model.total_cars }} - -
    -

    {% trans "Trims" %}

    -
      - {% for trim in model.trims %} -
    • - - {{ trim.trim_name }} -  - {% trans "Total" %}: - {{ trim.total_cars }}
      • - {% empty %} -
    • {% trans "No trims available" %}
      • - {% endfor %} -
    -
    -
    • - {% empty %} -
  • {% trans "No models available." %}
    • - {% endfor %} -
-
+
+
+
+
+
+
+
+
+
+
-
- {% endfor %} -
+
+
+ +
+
+ +
+ {% for make in inventory.makes %} +
+

+ +

+
+
+

{% trans "models"|capfirst %}

+
    + {% for model in make.models %} +
  • + {{ model.model_name }}:  + {{ model.total_cars }} + +
    +

    {% trans "Trims" %}

    +
      + {% for trim in model.trims %} +
    • + {{ trim.trim_name }} - {% trans "Total" %}: + {{ trim.total_cars }} +
      • + {% empty %} +
    • {% trans "No trims available" %}
      • + {% endfor %} +
    +
    +
    • + {% empty %} +
  • {% trans "No models available." %}
    • + {% endfor %} +
+
+
+
+ {% endfor %} +
+
-
- {% endblock %} diff --git a/templates/inventory/reserve_car.html b/templates/inventory/reserve_car.html index 85f19abe..e5c5266e 100644 --- a/templates/inventory/reserve_car.html +++ b/templates/inventory/reserve_car.html @@ -1,32 +1,25 @@ - {% extends 'base.html' %} {% load i18n %} - -{% block title %}{% trans "Reserve Car" %}{% endblock %} - +{% block title %} + {% trans "Reserve Car" %} +{% endblock %} {% block content %}

{% trans "Reserve Car" %}

-

{% trans "You are reserving" %}: {{ car }}

- {% csrf_token %}
{{ form.reservation_start }} - {% for error in form.reservation_start.errors %} -
{{ error }}
- {% endfor %} + {% for error in form.reservation_start.errors %}
{{ error }}
{% endfor %}
{{ form.reservation_end }} - {% for error in form.reservation_end.errors %} -
{{ error }}
- {% endfor %} + {% for error in form.reservation_end.errors %}
{{ error }}
{% endfor %}
{% trans "Cancel" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/inventory/scan_vin.html b/templates/inventory/scan_vin.html index ed2a6a4e..99e38a9a 100644 --- a/templates/inventory/scan_vin.html +++ b/templates/inventory/scan_vin.html @@ -1,32 +1,28 @@ {% extends 'base.html' %} -{% load static i18n%} - +{% load static i18n %} {% block content %}
-

{{ _("Scan Vehicle Code")}}

- +

{{ _("Scan Vehicle Code") }}

- +
- +
- -
- -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/templates/inventory/transfer_car.html b/templates/inventory/transfer_car.html index 01f5fdf1..1d1b0b55 100644 --- a/templates/inventory/transfer_car.html +++ b/templates/inventory/transfer_car.html @@ -1,7 +1,8 @@ {% extends 'base.html' %} {% load i18n %} - -{% block title %}{% trans "Transfer Car"|capfirst %}{% endblock title %} +{% block title %} + {% trans "Transfer Car"|capfirst %} +{% endblock title %} {% block content %}

{% trans "transfer car"|capfirst %}

@@ -10,18 +11,10 @@
{{ field }} - {% if field.errors %} -
- {{ field.errors }} -
- {% endif %} - {% if field.help_text %} - {{ field.help_text|safe }} - {% endif %} + {% if field.errors %}
{{ field.errors }}
{% endif %} + {% if field.help_text %}{{ field.help_text|safe }}{% endif %}
{% endfor %}
{% endblock %} - - diff --git a/templates/inventory/transfer_details.html b/templates/inventory/transfer_details.html index 2ed0a69b..3f8fabeb 100644 --- a/templates/inventory/transfer_details.html +++ b/templates/inventory/transfer_details.html @@ -3,115 +3,138 @@ {% load i18n %} {% load custom_filters %} {% load num2words_tags %} - {% block title %} - {% trans 'Car Transfer Details' %} + {% trans 'Car Transfer Details' %} {% endblock %} - {% block content %} - -