better email error logging and some pretty printing for admin interface

core/inventory/api_v1.py

@@ -1,5 +1,4 @@
-from datetime import datetime
-
+from django.utils import timezone
 from django.urls import re_path
 from rest_framework import routers, viewsets, serializers
 from rest_framework.decorators import api_view, permission_classes, authentication_classes
@@ -87,7 +86,7 @@ class ItemSerializer(serializers.ModelSerializer):
     def update(self, instance, validated_data):
         if 'returned' in validated_data:
             if validated_data['returned']:
-                validated_data['returned_at'] = datetime.now()
+                validated_data['returned_at'] = timezone.now()
             validated_data.pop('returned')
         if 'dataImage' in validated_data:
             file = File.objects.create(data=validated_data['dataImage'])

core/inventory/models.py

@@ -35,6 +35,9 @@ class Item(SoftDeleteModel):
             ('match_item', 'Can match item')
         ]
 
+    def __str__(self):
+        return '[' + str(self.uid) + ']' + self.description
+
 
 class Container(SoftDeleteModel):
     cid = models.AutoField(primary_key=True)
@@ -42,6 +45,9 @@ class Container(SoftDeleteModel):
     created_at = models.DateTimeField(blank=True, null=True)
     updated_at = models.DateTimeField(blank=True, null=True)
 
+    def __str__(self):
+        return '[' + str(self.cid) + ']' + self.name
+
 
 class Event(models.Model):
     eid = models.AutoField(primary_key=True)
@@ -53,3 +59,6 @@ class Event(models.Model):
     post_end = models.DateTimeField(blank=True, null=True)
     created_at = models.DateTimeField(null=True, auto_now_add=True)
     updated_at = models.DateTimeField(blank=True, null=True)
+
+    def __str__(self):
+        return '[' + str(self.slug) + ']' + self.name

core/inventory/tests/v2/test_items.py

@@ -1,5 +1,4 @@
-from datetime import datetime
-
+from django.utils import timezone
 from django.test import TestCase, Client
 from django.contrib.auth.models import Permission
 from knox.models import AuthToken
@@ -164,7 +163,7 @@ class ItemTestCase(TestCase):
         response = self.client.get(f'/api/2/{self.event.slug}/item/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.json()), 2)
-        item2.returned_at = datetime.now()
+        item2.returned_at = timezone.now()
         item2.save()
         response = self.client.get(f'/api/2/{self.event.slug}/item/')
         self.assertEqual(response.status_code, 200)