From 326cd032967965c4b849373c4648aac3e3eaa029 Mon Sep 17 00:00:00 2001 From: Flatlogic Bot Date: Sun, 11 Jan 2026 16:49:50 +0000 Subject: [PATCH] Revert to version 8f91cb5 --- core/__pycache__/admin.cpython-311.pyc | Bin 855 -> 907 bytes core/__pycache__/models.cpython-311.pyc | Bin 2066 -> 2538 bytes core/__pycache__/views.cpython-311.pyc | Bin 2126 -> 2179 bytes core/admin.py | 6 +++--- core/migrations/0001_initial.py | 5 +++-- .../__pycache__/0001_initial.cpython-311.pyc | Bin 1686 -> 1789 bytes core/models.py | 11 +++++++++-- core/templates/core/index.html | 18 ++++++++++-------- core/views.py | 9 ++++++--- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc index 7d809905f697135fc5183a94e4d90f31abc077ec..3940cbd73009907f4da9bf42579ffdcc3b5bc166 100644 GIT binary patch delta 214 zcmcc4*3HhhoR^o20SLOzC1)xyP2~H`$Ud2g(cE7+vA8%hJufviJ}tATxFkL=F*o&= z5L_@P5hli4l$xBHS(cg-pORRTs>xEs4K%HY2So6K2tFX8$v!!SQI88DI(ZV~COr+H zOamN#U||pmU~2HWAr#f%{eg)=G?J;o_XfXGg9iu}NlwmT@|2PQnJ5V&q=3XP4x8Nk Sl+v73yCV6?=b2hqKr#UB^g2`k delta 161 zcmeBXzs|qK;jpNO>TZlX-=wLk=$fv<`x!^3;$pO#rvToRv` zn45Y_2rihD2o)<*0ct6d020L@mjE3OGC~lpFf%W+Br`FmxJn`*u_!q;M-M|r0jMFU z*cC`NFg)PqzrwBjfq{`TjBy3a6%Bg`^M;7T6%m~kfmcNIH>g}O@;sq<#mMKPh|hK5 z;7h{67llKw2!~$a3BAED)KOd{12oA`Q*`nSR#!&F$@f?txQaA^LPc6YVzLICys0#h zaf_p%D8C@JsHCz;4J4@zBvvwj^@4p+#0nAx5zIhbtjjpLoNbn|l-3NjD^gk;k`IWS zaJe8Acu^|wid5hQ7V#UBnlr?%NNR2fKEQIq2KczG$)vm~T@)mYgOGQSY T8JI*zSWnDHkoXrYl3?Qi_8_wK delta 357 zcmaDQJV}6WIWI340}#wRk(~L3c_Lpmqr=87E=FrUkRS*w1LDn&@9NioR^o20SJ7~Cujbc$lK4y2jnmV@#kes3=GpJ%P~nzJfy<-cCtK^E zd@1}X0x5ziLMg&vjUsDA32PKf5l@jwkxY?Fkxr3Gkp*j%BVc2+y*#SHwTv~4DGDiy zbC_zGNTdcvknI#!TEI>(3 z##<~YiIv5goRbeShp7uE78hrx=cT5`r)3rum&E5K=BC~ff(zy(Lc}J^vs7}icqQhg z-ePviPn|rErI_y)Yd~sAYSArLul&5!;>ohCn;8`+Uu5-G)&p9@2E@e)z~F3Pc*-r< zV|Sff;S#sPMQ)`l+)5u96eruWDX=Q2-H=zCoX93yFU-Ix_mP2%lj{qJ_y8iliZO8V z_wZfkkiEnqdqYC?hNRIAX{{SF<~L+CZwSlX0BKgaE2T6?XQtj9y|orsv~3SKUeI>C zsO@$INJ_bVAl6XL8+W4hDwR9FwaV&3U;~cv5&%_)_>&1X2XSs)W`EW2h2I5lsStCGerOL6iICM$cHWsE?xffxd68EY6*WK-nkFx4`Zh{8k}7-|?&jl3%1?Si}O9(`3BGl9E_itjRI?1alY%M`Cet zW_n)gWLK6-Hde=!+|0bmCs>Mkkn|Z%_GI16C_VWvtGBWS&;&LhE)EAetAXJuw_uOm zb#8@A+zJ=Dm9B6rePEEAoXw`dB&s-h0-J2TAOok|M+Qz#t}h_s1Bm!4!obPj!*`uS z_7aEe4GGm7l14YAwQk6m-;mL~AuM-8ROYUf(j1+cdUN#FT3pe#J>Ymj+wG#Z+Z7-w z<@SMC6E$zhnBADH&&~#QiYPXXVv}>&I}{ax{wV@^Y$ZdHCWx&LBz|$&5}%ito2toti!~`HF)zDF z0I2B}OI~SC&MhIh!kk2?y3HNT+>DH6o2RgFGuEqJ(6Cs+c16QtN6CeN;0sZ47c}B8 zYQ$gBh`%6^a6?e_g1Y&FvMcK5J5o**UxM^5tVM8QDHCU=kC!t_Y}n1WA0sA`3PT0NcQB A_y7O^ delta 274 zcmey%JB^ojIWI340}w1ak(?Pgk++#k0K@}=&l5JzN?@F<#3Uunxkhps69dC)AclZ+ z#weZ?sbB_8>CNFxHjJ_yiN(d4>3ONCn#{LYlX4RCvWq~*++xWq&B@t(o|&7GF>Lc~ z7H&pq=?k*DGs3RO>TYm35PYKKf^5h|*^n!;Ar}NfCo8gvDhP9l@O@zA<>dOv03^PE zh!4#CLTn9QAXsEFIgCwB${1*NkqL+}1ronFY;yBcN^?@}ip(cZW7D+~V`TflfJsc? Qx+0+R5hU>ii!9hY0BzGn%K!iX diff --git a/core/models.py b/core/models.py index 4924dee..bd9aa0a 100644 --- a/core/models.py +++ b/core/models.py @@ -13,7 +13,8 @@ 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 = models.CharField(max_length=100, blank=True, null=True) + assignee_first_name = 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): @@ -26,4 +27,10 @@ class Parcel(models.Model): if len(parts) > 1: return (parts[0][0] + parts[-1][0]).upper() return parts[0][0].upper() - return "?" \ No newline at end of file + 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" \ No newline at end of file diff --git a/core/templates/core/index.html b/core/templates/core/index.html index c2ad44c..effc754 100644 --- a/core/templates/core/index.html +++ b/core/templates/core/index.html @@ -30,13 +30,8 @@ {% for parcel in parcels %} -
-
{{ parcel.sender_initials }}
-
-
{{ parcel.sender_name }}
-
{{ parcel.sender_email }}
-
-
+
{{ parcel.sender_name }}
+
{{ parcel.sender_email }}
{{ parcel.recipient_name }}
@@ -52,7 +47,14 @@ Pending {% endif %} - {{ parcel.assignee }} + +
+
{{ parcel.assignee_initials }}
+
+
{{ parcel.assignee_first_name }} {{ parcel.assignee_last_name }}
+
+
+ {{ parcel.received_date|date:"M d, Y, P" }} {% empty %} diff --git a/core/views.py b/core/views.py index 29407ed..cbcf964 100644 --- a/core/views.py +++ b/core/views.py @@ -13,7 +13,8 @@ def index(request): recipient_email='jane.smith@example.com', tracking_number='JD123456789', status='pending', - assignee='Operator 1', + assignee_first_name='John', + assignee_last_name='Smith', received_date=timezone.now() - datetime.timedelta(days=1) ) Parcel.objects.create( @@ -23,7 +24,8 @@ def index(request): recipient_email='mary.williams@example.com', tracking_number='PJ987654321', status='processed', - assignee='Admin', + assignee_first_name='Jane', + assignee_last_name='Doe', received_date=timezone.now() - datetime.timedelta(hours=5) ) Parcel.objects.create( @@ -33,7 +35,8 @@ def index(request): recipient_email='david.miller@example.com', tracking_number='SB112233445', status='rejected', - assignee='Operator 2', + assignee_first_name='Peter', + assignee_last_name='Jones', received_date=timezone.now() - datetime.timedelta(days=2) )