patch prikaži stranicu servisnih zapisa sa SN dizalice
This commit is contained in:
@@ -207,12 +207,13 @@ class VehicleServiceRecordSerializer(serializers.ModelSerializer):
|
||||
performed_by_name = serializers.SerializerMethodField()
|
||||
vehicle_registration = serializers.SerializerMethodField()
|
||||
task_label = serializers.SerializerMethodField()
|
||||
crane_serial_number = serializers.SerializerMethodField()
|
||||
|
||||
class Meta:
|
||||
model = VehicleServiceRecord
|
||||
fields = [
|
||||
'id', 'vehicle', 'crane', 'vehicle_registration', 'crane_registration',
|
||||
'task', 'task_label',
|
||||
'task', 'task_label', 'crane_serial_number',
|
||||
'performed_by', 'performed_by_name',
|
||||
'service_title', 'description', 'parts', 'cost',
|
||||
'service_date', 'mileage', 'next_service_due_at',
|
||||
@@ -261,6 +262,12 @@ class VehicleServiceRecordSerializer(serializers.ModelSerializer):
|
||||
return None
|
||||
return obj.task.title
|
||||
|
||||
def get_crane_serial_number(self, obj):
|
||||
# Provjeri je li povezano vozilo/dizalica postoji i vrati serijski broj
|
||||
if hasattr(obj, 'vehicle') and obj.vehicle:
|
||||
return getattr(obj.vehicle, 'crane_serial_number', None)
|
||||
return None
|
||||
|
||||
def create(self, validated_data):
|
||||
request = self.context.get('request')
|
||||
user = getattr(request, 'user', None)
|
||||
|
||||
@@ -898,7 +898,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
|
||||
<AnimatedDataTable
|
||||
columns={[
|
||||
{ key: 'date', label: 'Datum', className: 'px-4 py-3' },
|
||||
{ key: 'crane', label: 'Dizalica', className: 'px-4 py-3' },
|
||||
{ key: 'crane', label: 'SN', className: 'px-4 py-3' },
|
||||
{ key: 'description', label: 'Opis', className: 'px-4 py-3' },
|
||||
{ key: 'cost', label: 'Trošak', className: 'px-4 py-3' },
|
||||
{ key: 'files', label: 'Datoteke', className: 'px-4 py-3' },
|
||||
@@ -909,8 +909,11 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
|
||||
rowClassName="hover:bg-canvas-deep"
|
||||
renderRow={(record) => (
|
||||
<>
|
||||
{/* <pre className="text-xs bg-gray-100 p-2">
|
||||
{JSON.stringify(group, null, 2)}
|
||||
</pre> */}
|
||||
<td className="px-4 py-3">{formatDate(record.service_date)}</td>
|
||||
<td className="px-4 py-3">{record.crane_registration || record.vehicle_registration || '-'}</td>
|
||||
<td className="px-4 py-3">{record.crane_serial_number || record.vehicle_registration || '-'}</td>
|
||||
<td className="max-w-md truncate px-4 py-3" title={record.description || ''}>
|
||||
{record.description || '-'}
|
||||
</td>
|
||||
|
||||
Reference in New Issue
Block a user