return Stop information fetch from jamestop api in the Slide info - id to idBook and idSlide to avoid confusion
authorrougeronj
Wed, 18 Mar 2015 16:21:58 +0100
changeset 18 4d3f67ddbe72
parent 17 cf07ed692810
child 19 22b9a23dd525
return Stop information fetch from jamestop api in the Slide info - id to idBook and idSlide to avoid confusion
server/ammico/serializers.py
server/ammico/urls.py
server/ammico/views.py
--- a/server/ammico/serializers.py	Wed Mar 18 16:16:37 2015 +0100
+++ b/server/ammico/serializers.py	Wed Mar 18 16:21:58 2015 +0100
@@ -1,5 +1,6 @@
 from rest_framework import serializers
 from .models import Book, Slide
+from ammico.utils import fetchJson
 
 
 class BookSerializer(serializers.ModelSerializer):
@@ -9,7 +10,15 @@
         fields = ('id', 'idArticle', 'title', 'description', 'image', 'date')
         
 class SlideSerializer(serializers.ModelSerializer):
+    details = serializers.SerializerMethodField('getStopInfo')
+    
+    def getStopInfo(self, slide):
+        stopList = fetchJson('http://fui-ammico.jamespot.pro/api/api.php?&k=6c8bfcea247e8a5841288269887d88f0&d=2016-01-31&m=EXT-IRI&v=2.0&f=list&o=article&type=stop&itemFormat=article')
+        #print (stopList) 
+        for stops in stopList:
+            if (slide.idStop == stops['idStop']):
+                return stops 
 
     class Meta:
         model = Slide
-        fields = ('id', 'book', 'idStop', 'comment', 'date', 'favorite')
+        fields = ('id', 'book', 'idStop', 'comment', 'date', 'favorite', 'details')
\ No newline at end of file
--- a/server/ammico/urls.py	Wed Mar 18 16:16:37 2015 +0100
+++ b/server/ammico/urls.py	Wed Mar 18 16:21:58 2015 +0100
@@ -2,9 +2,9 @@
 from .views import populateUser, ListBooks, InfoBook, ListSlides, InfoSlide
 
 urlpatterns = patterns('',
-    url(r'^populateUser/', populateUser, name='populateUser'),
+    url(r'^populateUser/$', populateUser, name='populateUser'),
     url(r'^books/$', ListBooks.as_view()),
-    url(r'^books/(?P<id>[0-9]+)$', InfoBook.as_view()),
+    url(r'^books/(?P<idBook>[0-9]+)$', InfoBook.as_view()),
     url(r'^slides/$', ListSlides.as_view()),
-    url(r'^slides/(?P<id>[0-9]+)$', InfoSlide.as_view()),
+    url(r'^slides/(?P<idSlide>[0-9]+)$', InfoSlide.as_view()),
 )
--- a/server/ammico/views.py	Wed Mar 18 16:16:37 2015 +0100
+++ b/server/ammico/views.py	Wed Mar 18 16:21:58 2015 +0100
@@ -80,9 +80,9 @@
     #permission_classes = (permissions.IsAdminUser,)
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
-    def get(self, request, id):
+    def get(self, request, idBook):
         try:
-            book = Book.objects.get(id=id)
+            book = Book.objects.get(id=idBook)
         except Book.DoesNotExist:
             return HttpResponse(status=404)
         
@@ -113,9 +113,9 @@
     #permission_classes = (permissions.IsAdminUser,)
     permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
 
-    def get(self, request, id):
+    def get(self, request, idSlide):
         try:
-            slide = Slide.objects.get(id=id)
+            slide = Slide.objects.get(id=idSlide)
         except Slide.DoesNotExist:
             return HttpResponse(status=404)