add more serializers and viewsets

diff --git a/timeside/serializers.py b/timeside/serializers.py
index a42fd297a3442566754a9b7425ca4d9061935ee2..cfcf08ce48644eb2ceeb609c3a6cd0b19049f0e0 100644 (file)
--- a/timeside/serializers.py
+++ b/timeside/serializers.py
@@ -7,13 +7,47 @@ class SelectionSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Selection
-        fields = ('id', 'author', 'items')
+        fields = ('id', 'items', 'author')
 
 
 class ItemSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Item
-        fields = ('id', 'title', 'mime_type')
+        fields = ('id', 'title', 'file', 'mime_type', 'author')
 
 
+class ExperienceSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Experience
+        fields = ('id', 'processors', 'is_preset', 'author')
+
+
+class ProcessorSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Processor
+        fields = ('id', 'pid', 'version')
+
+
+class ResultSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Result
+        fields = ('id', 'item', 'processor', 'status')
+
+
+class ParametersSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Parameters
+        fields = ('id', 'processor', 'parameters', 'is_preset')
+
+
+class TaskSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Task
+        fields = ('id', 'experience', 'selection', 'status', 'author')
+

diff --git a/timeside/urls.py b/timeside/urls.py
index 9a2a40f926c86e9fd3f41a1ce5dedce9b6788202..8337fa9575ce7c2fc6f12934d8f8103faf70d96c 100644 (file)
--- a/timeside/urls.py
+++ b/timeside/urls.py
@@ -8,8 +8,13 @@ from timeside import views
 admin.autodiscover()
 
 api_router = routers.DefaultRouter()
-api_router.register(r'items', views.ItemViewSet)
 api_router.register(r'selections', views.SelectionViewSet)
+api_router.register(r'items', views.ItemViewSet)
+api_router.register(r'experiences', views.ExperienceViewSet)
+api_router.register(r'processors', views.ProcessorViewSet)
+api_router.register(r'results', views.ResultViewSet)
+api_router.register(r'parameters', views.ParametersViewSet)
+api_router.register(r'tasks', views.TaskViewSet)
 
 urlpatterns = patterns('',
     url(r'^$', views.IndexView.as_view(), name="timeside-index"),

diff --git a/timeside/views.py b/timeside/views.py
index 339f546a19d605aa8d275dd940dd885390970244..6312baff61991b01df2dd4129e1bdf9570961a71 100644 (file)
--- a/timeside/views.py
+++ b/timeside/views.py
@@ -46,16 +46,43 @@ class ItemAnalyzerView(DetailView):
     
 
 
+class SelectionViewSet(viewsets.ModelViewSet):
+    
+    model = Selection
+    serializer_class = SelectionSerializer
+
+
 class ItemViewSet(viewsets.ModelViewSet):
     
     model = Item
     serializer_class = ItemSerializer
 
 
-class SelectionViewSet(viewsets.ModelViewSet):
+class ExperienceViewSet(viewsets.ModelViewSet):
     
-    model = Selection
-    serializer_class = SelectionSerializer
+    model = Experience
+    serializer_class = ExperienceSerializer
 
 
+class ProcessorViewSet(viewsets.ModelViewSet):
+    
+    model = Processor
+    serializer_class = ProcessorSerializer
+
+
+class ResultViewSet(viewsets.ModelViewSet):
+    
+    model = Result
+    serializer_class = ResultSerializer
+
 
+class ParametersViewSet(viewsets.ModelViewSet):
+    
+    model = Parameters
+    serializer_class = ParametersSerializer
+
+
+class TaskViewSet(viewsets.ModelViewSet):
+    
+    model = Task
+    serializer_class = TaskSerializer