Skip to content

Commit 6ec3746

Browse files
committed
Merge pull request #3 from wckd/issue1-logging
Issue #1 - logging
2 parents a5b8466 + 89c1cb4 commit 6ec3746

File tree

4 files changed

+29
-0
lines changed

4 files changed

+29
-0
lines changed

p0sx/urls.py

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from pos.views.shift import ShiftViewSet
77
from pos.views.stock import CategoryViewSet, IngredientViewSet, ItemViewSet, OrderLineViewSet, OrderViewSet, PurchaseViewSet
88
from pos.views.user import UserViewSet
9+
from pos.views.simplelog import LogViewSet
910

1011
from rest_framework import routers
1112

@@ -19,6 +20,7 @@
1920
router.register(r'orders', OrderViewSet)
2021
router.register(r'shifts', ShiftViewSet)
2122
router.register(r'purchases', PurchaseViewSet, 'purchase')
23+
router.register(r'logs', LogViewSet)
2224
urlpatterns = [
2325
url(r'^$', RedirectView.as_view(url=reverse_lazy('admin:index'))),
2426
url(r'^admin/', include(admin.site.urls)),

pos/models/simplelog.py

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
from django.db import models
2+
3+
4+
class Log(models.Model):
5+
when = models.DateTimeField(auto_now=True, auto_now_add=True, blank=False)
6+
what = models.CharField(max_length=255)
7+
who = models.ForeignKey(User)
8+
9+
def __str__(self):
10+
return '{0} gjorde {1} følgende: {2}'.format(when, who, what)

pos/serializers/simplelog.py

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
from pos.models.simplelog import Log
2+
3+
from rest_framework import serializers
4+
5+
6+
class LogSerializer(serializers.ModelSerializer):
7+
class Meta:
8+
model = Log
9+
fields = ('when', 'what', 'who')

pos/views/simplelog.py

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
from pos.models.simplelog import Log
2+
from pos.serializers.simplelog import LogSerializer
3+
from rest_framework import viewsets
4+
5+
6+
class LogViewSet(viewsets.ModelViewSet):
7+
queryset = Log.objects.all()
8+
serializer_class = LogSerializer

0 commit comments

Comments
 (0)