Revert to version 7cfd045

core/admin.py

@@ -3,7 +3,7 @@ from .models import Parcel
 
 @admin.register(Parcel)
 class ParcelAdmin(admin.ModelAdmin):
-    list_display = ('tracking_number', 'sender_name', 'recipient_name', 'status', 'assignee_first_name', 'assignee_last_name', 'received_date')
+    list_display = ('tracking_number', 'sender_name', 'recipient_name', 'status', 'assignee', 'received_date')
-    list_filter = ('status', 'assignee_first_name', 'assignee_last_name', 'received_date')
+    list_filter = ('status', 'assignee', 'received_date')
-    search_fields = ('tracking_number', 'sender_name', 'recipient_name', 'sender_email', 'recipient_email', 'assignee_first_name', 'assignee_last_name')
+    search_fields = ('tracking_number', 'sender_name', 'recipient_name', 'sender_email', 'recipient_email')
     ordering = ('-received_date',)

core/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.7 on 2026-01-11 16:23
+# Generated by Django 5.2.7 on 2026-01-11 15:58
 
 from django.db import migrations, models
 
@@ -21,8 +21,7 @@ class Migration(migrations.Migration):
                 ('recipient_email', models.EmailField(max_length=254)),
                 ('tracking_number', models.CharField(max_length=100, unique=True)),
                 ('status', models.CharField(choices=[('pending', 'Pending'), ('processed', 'Processed'), ('rejected', 'Rejected')], default='pending', max_length=20)),
-                ('assignee_first_name', models.CharField(blank=True, max_length=100, null=True)),
+                ('assignee', models.CharField(blank=True, max_length=100, null=True)),
-                ('assignee_last_name', models.CharField(blank=True, max_length=100, null=True)),
                 ('received_date', models.DateTimeField()),
             ],
         ),

core/models.py

@@ -13,8 +13,7 @@ class Parcel(models.Model):
     recipient_email = models.EmailField()
     tracking_number = models.CharField(max_length=100, unique=True)
     status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='pending')
-    assignee_first_name = models.CharField(max_length=100, blank=True, null=True)
+    assignee = models.CharField(max_length=100, blank=True, null=True)
-    assignee_last_name = models.CharField(max_length=100, blank=True, null=True)
     received_date = models.DateTimeField()
 
     def __str__(self):
@@ -27,10 +26,4 @@ class Parcel(models.Model):
             if len(parts) > 1:
                 return (parts[0][0] + parts[-1][0]).upper()
             return parts[0][0].upper()
-        return "?"
+        return "?"
-
-    @property
-    def assignee_initials(self):
-        if self.assignee_first_name and self.assignee_last_name:
-            return (self.assignee_first_name[0] + self.assignee_last_name[0]).upper()
-        return "A"

core/templates/core/index.html

@@ -30,8 +30,13 @@
             {% for parcel in parcels %}
             <tr>
               <td class="px-4">
-                <div class="fw-bold">{{ parcel.sender_name }}</div>
+                <div class="d-flex align-items-center">
-                <div class="text-muted small">{{ parcel.sender_email }}</div>
+                  <div class="avatar avatar-indigo me-3">{{ parcel.sender_initials }}</div>
+                  <div>
+                    <div class="fw-bold">{{ parcel.sender_name }}</div>
+                    <div class="text-muted small">{{ parcel.sender_email }}</div>
+                  </div>
+                </div>
               </td>
               <td class="px-4">
                 <div class="fw-bold">{{ parcel.recipient_name }}</div>
@@ -47,14 +52,7 @@
                   <span class="badge status-pill status-pending">Pending</span>
                 {% endif %}
               </td>
-              <td class="px-4">
+              <td class="px-4">{{ parcel.assignee }}</td>
-                <div class="d-flex align-items-center">
-                  <div class="avatar avatar-indigo me-3">{{ parcel.assignee_initials }}</div>
-                  <div>
-                    <div class="fw-bold">{{ parcel.assignee_first_name }} {{ parcel.assignee_last_name }}</div>
-                  </div>
-                </div>
-              </td>
               <td class="text-muted px-4">{{ parcel.received_date|date:"M d, Y, P" }}</td>
             </tr>
             {% empty %}

core/views.py

@@ -13,8 +13,7 @@ def index(request):
             recipient_email='jane.smith@example.com',
             tracking_number='JD123456789',
             status='pending',
-            assignee_first_name='John',
+            assignee='Operator 1',
-            assignee_last_name='Smith',
             received_date=timezone.now() - datetime.timedelta(days=1)
         )
         Parcel.objects.create(
@@ -24,8 +23,7 @@ def index(request):
             recipient_email='mary.williams@example.com',
             tracking_number='PJ987654321',
             status='processed',
-            assignee_first_name='Jane',
+            assignee='Admin',
-            assignee_last_name='Doe',
             received_date=timezone.now() - datetime.timedelta(hours=5)
         )
         Parcel.objects.create(
@@ -35,8 +33,7 @@ def index(request):
             recipient_email='david.miller@example.com',
             tracking_number='SB112233445',
             status='rejected',
-            assignee_first_name='Peter',
+            assignee='Operator 2',
-            assignee_last_name='Jones',
             received_date=timezone.now() - datetime.timedelta(days=2)
         )