modify accounting model

billard/serializers.py

@@ -2,25 +2,7 @@ from billard.models import *
 from rest_framework import serializers
 
 
-class ClientSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        #model = Client
-        fields = ('id', 'location',)
-
-
-class LocationSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        #model = Location
-        fields = ('name',)
-
-
-class TableSerializer(serializers.HyperlinkedModelSerializer):
-    class Meta:
-        #model = Table
-        fields = ('client', 'number', 'name',)
-
-
 class LocationDataSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = LocationData
-        fields = ('location_id', 'table_no', 'tst', 'on_off',)
+        fields = ('client_id', 'desk_no', 'tst', 'on_off',)

billard/templatetags/display_client.py

@@ -36,7 +36,8 @@ def display_client(client, desk_no):
         for a in acc:
             html += '            <tr>\n'
             html += '                <td>{}</td>\n'.format(a.time_from.strftime('%d.%m.%Y %H:%M:%S'))
-            html += '                <td>{}</td>\n'.format((a.time_to if a.time_to is not None else ''))
+            html += '                <td>{}</td>\n'.format(
+                (a.time_to.strftime('%d.%m.%Y %H:%M:%S') if a.time_to is not None else ''))
             html += '                <td style="text-align: center;">{}</td>\n'\
                 .format((a.prize if a.prize is not None else ''))
             html += '            <tr>\n'

billard/urls.py

@@ -3,9 +3,6 @@ from rest_framework import routers
 from billard import views
 
 router = routers.DefaultRouter()
-router.register(r'clients', views.ClientViewSet)
-router.register(r'locations', views.LocationViewSet)
-router.register(r'tables', views.TableViewSet)
 router.register(r'location_data', views.LocationDataViewSet)
 
 urlpatterns = [

billard/views.py

@@ -8,21 +8,6 @@ from django.contrib.auth.decorators import login_required
 from django.db.models import Min
 
 
-class ClientViewSet(viewsets.ModelViewSet):
-    queryset = LocationData.objects.all()
-    serializer_class = ClientSerializer
-
-
-class LocationViewSet(viewsets.ModelViewSet):
-    queryset = LocationData.objects.all()
-    serializer_class = LocationSerializer
-
-
-class TableViewSet(viewsets.ModelViewSet):
-    queryset = LocationData.objects.all()
-    serializer_class = TableSerializer
-
-
 class LocationDataViewSet(viewsets.ModelViewSet):
     queryset = LocationData.objects.all()
     serializer_class = LocationDataSerializer