patch oko teksta PDFa i UI tablica

backend/core/users/serializers.py

@@ -1,5 +1,4 @@
 from rest_framework import serializers
-from django.core.exceptions import ObjectDoesNotExist
 from .models import CustomUser
 
 class UserSerializer(serializers.ModelSerializer):
@@ -14,11 +13,8 @@ class UserSerializer(serializers.ModelSerializer):
             'first_name': {'required': True, 'allow_blank': False}
         }
 
-    def _get_assigned_asset(self, obj):
-        try:
-            return obj.assigned_vehicles
-        except ObjectDoesNotExist:
-            return None
+    def _get_assigned_assets(self, obj):
+        return obj.assigned_vehicles.all()
 
     def _serialize_asset(self, vehicle):
         if not vehicle:
@@ -34,10 +30,14 @@ class UserSerializer(serializers.ModelSerializer):
         }
 
     def get_assigned_vehicle(self, obj):
-        return self._serialize_asset(self._get_assigned_asset(obj))
+        assigned = self._get_assigned_assets(obj)
+        vehicle = assigned.filter(asset_type='vehicle').first() or assigned.first()
+        return self._serialize_asset(vehicle)
 
     def get_assigned_crane(self, obj):
-        return self._serialize_asset(self._get_assigned_asset(obj))
+        assigned = self._get_assigned_assets(obj)
+        crane = assigned.filter(asset_type='crane').first() or assigned.first()
+        return self._serialize_asset(crane)
     
     def validate(self, data):
         """