diff --git a/core/__pycache__/forms.cpython-311.pyc b/core/__pycache__/forms.cpython-311.pyc index 1592574..cb35ac5 100644 Binary files a/core/__pycache__/forms.cpython-311.pyc and b/core/__pycache__/forms.cpython-311.pyc differ diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index 911f0d2..30bef6c 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/forms.py b/core/forms.py index 0a63f9c..a8bfadc 100644 --- a/core/forms.py +++ b/core/forms.py @@ -66,7 +66,7 @@ class TruckForm(forms.ModelForm): fields = [ 'truck_type_link', 'model', 'model_ar', 'year', 'plate_no', 'load_capacity', 'load_capacity_ar', 'color', 'color_ar', 'registration_expiry_date', - 'truck_picture', 'registration_front', 'registration_back', 'driver_license' + 'truck_picture', 'registration_front', 'registration_back', 'driver_license_front', 'driver_license_back' ] widgets = { 'truck_type_link': forms.Select(attrs={'class': 'form-select'}), @@ -82,7 +82,8 @@ class TruckForm(forms.ModelForm): 'truck_picture': forms.FileInput(attrs={'class': 'form-control'}), 'registration_front': forms.FileInput(attrs={'class': 'form-control'}), 'registration_back': forms.FileInput(attrs={'class': 'form-control'}), - 'driver_license': forms.FileInput(attrs={'class': 'form-control'}), + 'driver_license_front': forms.FileInput(attrs={'class': 'form-control'}), + 'driver_license_back': forms.FileInput(attrs={'class': 'form-control'}), } def __init__(self, *args, **kwargs): @@ -144,4 +145,4 @@ class ShipperOfferForm(forms.Form): delivery_date = forms.DateField(label=_('Requested Delivery Date'), widget=forms.DateInput(attrs={'class': 'form-control', 'type': 'date'})) amount = forms.DecimalField(label=_('Offer Amount'), max_digits=10, decimal_places=2, widget=forms.NumberInput(attrs={'class': 'form-control', 'step': '0.01'})) - comments = forms.CharField(label=_('Comments'), required=False, widget=forms.Textarea(attrs={'class': 'form-control', 'rows': 2})) + comments = forms.CharField(label=_('Comments'), required=False, widget=forms.Textarea(attrs={'class': 'form-control', 'rows': 2})) \ No newline at end of file diff --git a/core/migrations/0012_remove_truck_driver_license_and_more.py b/core/migrations/0012_remove_truck_driver_license_and_more.py new file mode 100644 index 0000000..5f47d8c --- /dev/null +++ b/core/migrations/0012_remove_truck_driver_license_and_more.py @@ -0,0 +1,27 @@ +# Generated by Django 5.2.7 on 2026-01-23 16:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0011_trucktype_alter_truck_truck_type_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='truck', + name='driver_license', + ), + migrations.AddField( + model_name='truck', + name='driver_license_back', + field=models.ImageField(blank=True, null=True, upload_to='docs/', verbose_name='Driver License (Back Face)'), + ), + migrations.AddField( + model_name='truck', + name='driver_license_front', + field=models.ImageField(blank=True, null=True, upload_to='docs/', verbose_name='Driver License (Front Face)'), + ), + ] diff --git a/core/migrations/__pycache__/0012_remove_truck_driver_license_and_more.cpython-311.pyc b/core/migrations/__pycache__/0012_remove_truck_driver_license_and_more.cpython-311.pyc new file mode 100644 index 0000000..8910af4 Binary files /dev/null and b/core/migrations/__pycache__/0012_remove_truck_driver_license_and_more.cpython-311.pyc differ diff --git a/core/models.py b/core/models.py index 7a45d31..0995c2c 100644 --- a/core/models.py +++ b/core/models.py @@ -109,7 +109,8 @@ class Truck(models.Model): truck_picture = models.ImageField(_('Truck Picture'), upload_to='trucks/', blank=True, null=True) registration_front = models.ImageField(_('Registration Front'), upload_to='docs/', blank=True, null=True) registration_back = models.ImageField(_('Registration Back'), upload_to='docs/', blank=True, null=True) - driver_license = models.ImageField(_('Driver License'), upload_to='docs/', blank=True, null=True) + driver_license_front = models.ImageField(_('Driver License (Front Face)'), upload_to='docs/', blank=True, null=True) + driver_license_back = models.ImageField(_('Driver License (Back Face)'), upload_to='docs/', blank=True, null=True) is_approved = models.BooleanField(_('Is Approved'), default=False) created_at = models.DateTimeField(auto_now_add=True) @@ -256,4 +257,4 @@ def sync_user_groups(sender, instance, **kwargs): instance.user.groups.remove(*other_groups) # Add user to the correct group - instance.user.groups.add(group) \ No newline at end of file + instance.user.groups.add(group) diff --git a/core/templates/core/admin_dashboard.html b/core/templates/core/admin_dashboard.html index 7fcc93d..d51c0ed 100644 --- a/core/templates/core/admin_dashboard.html +++ b/core/templates/core/admin_dashboard.html @@ -87,7 +87,8 @@ data-truck-picture="{% if truck.truck_picture %}{{ truck.truck_picture.url }}{% endif %}" data-reg-front="{% if truck.registration_front %}{{ truck.registration_front.url }}{% endif %}" data-reg-back="{% if truck.registration_back %}{{ truck.registration_back.url }}{% endif %}" - data-license="{% if truck.driver_license %}{{ truck.driver_license.url }}{% endif %}"> + data-license-front="{% if truck.driver_license_front %}{{ truck.driver_license_front.url }}{% endif %}" + data-license-back="{% if truck.driver_license_back %}{{ truck.driver_license_back.url }}{% endif %}"> {% trans "View" %} @@ -145,7 +146,8 @@ data-truck-picture="{% if truck.truck_picture %}{{ truck.truck_picture.url }}{% endif %}" data-reg-front="{% if truck.registration_front %}{{ truck.registration_front.url }}{% endif %}" data-reg-back="{% if truck.registration_back %}{{ truck.registration_back.url }}{% endif %}" - data-license="{% if truck.driver_license %}{{ truck.driver_license.url }}{% endif %}"> + data-license-front="{% if truck.driver_license_front %}{{ truck.driver_license_front.url }}{% endif %}" + data-license-back="{% if truck.driver_license_back %}{{ truck.driver_license_back.url }}{% endif %}"> {% trans "View" %} @@ -166,7 +168,7 @@