supporting one more api

4 files changed, 76 insertions, 9 deletions

diff --git a/blocks/blocks/xcosblocks/serializers.py b/blocks/blocks/xcosblocks/serializers.py
index 803d9430..4f3edc92 100644
--- a/blocks/blocks/xcosblocks/serializers.py
+++ b/blocks/blocks/xcosblocks/serializers.py
@@ -1,6 +1,7 @@
 from rest_framework import serializers
 
-from .models import Category, ParameterDataType, BlockType, Block, BlockParameter
+from .models import Category, ParameterDataType, BlockType, Block, \
+    BlockParameter
 
 
 class CategorySerializer(serializers.ModelSerializer):
diff --git a/blocks/blocks/xcosblocks/urls.py b/blocks/blocks/xcosblocks/urls.py
index c924c685..5d7d85d2 100644
--- a/blocks/blocks/xcosblocks/urls.py
+++ b/blocks/blocks/xcosblocks/urls.py
@@ -1,8 +1,9 @@
 from rest_framework.routers import DefaultRouter
 
-from .views import CategoryViewSet, BlockViewSet
+from .views import CategoryViewSet, BlockViewSet, BlockParameterViewSet
 
 router = DefaultRouter()
-router.register(r'categories', CategoryViewSet, basename='category')
-router.register(r'blocks', BlockViewSet, basename='block')
+router.register(r'categories', CategoryViewSet)
+router.register(r'blocks', BlockViewSet)
+router.register(r'block_parameters', BlockParameterViewSet)
 urlpatterns = router.urls
diff --git a/blocks/blocks/xcosblocks/views.py b/blocks/blocks/xcosblocks/views.py
index e864ceb1..36a2d792 100644
--- a/blocks/blocks/xcosblocks/views.py
+++ b/blocks/blocks/xcosblocks/views.py
@@ -2,8 +2,9 @@ from django_filters import FilterSet
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
-from .models import Category, Block
-from .serializers import CategorySerializer, BlockSerializer
+from .models import Category, Block, BlockParameter
+from .serializers import CategorySerializer, BlockSerializer, \
+    BlockParameterSerializer
 
 
 class CategoryFilterSet(FilterSet):
@@ -45,3 +46,23 @@ class BlockViewSet(ReadOnlyModelViewSet):
         DjangoFilterBackend
     ]
     filterset_class = BlockFilterSet
+
+
+class BlockParameterFilterSet(FilterSet):
+    class Meta:
+        model = BlockParameter
+        fields = {
+            'block': ['exact'],
+        }
+
+
+class BlockParameterViewSet(ReadOnlyModelViewSet):
+    """
+     Listing All Block Details
+    """
+    queryset = BlockParameter.objects.all()
+    serializer_class = BlockParameterSerializer
+    filter_backends = [
+        DjangoFilterBackend
+    ]
+    filterset_class = BlockParameterFilterSet
diff --git a/docs/api.txt b/docs/api.txt
index 63218f73..29b11ac1 100644
--- a/docs/api.txt
+++ b/docs/api.txt
@@ -21,7 +21,9 @@ Status Code
 Response JSON - Array of maps of
 
 id
+blocktype
 name
+categories
 initial_explicit_input_ports
 initial_implicit_input_ports
 initial_explicit_output_ports
@@ -33,93 +35,133 @@ block_image
 
 
 
-GET /block_parameter/{block_id}/
+GET /block_parameter/
 
 Status Code
 
 200
 
-Response JSON - Map of
+Response JSON - Array of maps of
 
 id
+p000
 p000_type
 p000_value_initial
+p001
 p001_type
 p001_value_initial
+p002
 p002_type
 p002_value_initial
+p003
 p003_type
 p003_value_initial
+p004
 p004_type
 p004_value_initial
+p005
 p005_type
 p005_value_initial
+p006
 p006_type
 p006_value_initial
+p007
 p007_type
 p007_value_initial
+p008
 p008_type
 p008_value_initial
+p009
 p009_type
 p009_value_initial
+p010
 p010_type
 p010_value_initial
+p011
 p011_type
 p011_value_initial
+p012
 p012_type
 p012_value_initial
+p013
 p013_type
 p013_value_initial
+p014
 p014_type
 p014_value_initial
+p015
 p015_type
 p015_value_initial
+p016
 p016_type
 p016_value_initial
+p017
 p017_type
 p017_value_initial
+p018
 p018_type
 p018_value_initial
+p019
 p019_type
 p019_value_initial
+p020
 p020_type
 p020_value_initial
+p021
 p021_type
 p021_value_initial
+p022
 p022_type
 p022_value_initial
+p023
 p023_type
 p023_value_initial
+p024
 p024_type
 p024_value_initial
+p025
 p025_type
 p025_value_initial
+p026
 p026_type
 p026_value_initial
+p027
 p027_type
 p027_value_initial
+p028
 p028_type
 p028_value_initial
+p029
 p029_type
 p029_value_initial
+p030
 p030_type
 p030_value_initial
+p031
 p031_type
 p031_value_initial
+p032
 p032_type
 p032_value_initial
+p033
 p033_type
 p033_value_initial
+p034
 p034_type
 p034_value_initial
+p035
 p035_type
 p035_value_initial
+p036
 p036_type
 p036_value_initial
+p037
 p037_type
 p037_value_initial
+p038
 p038_type
 p038_value_initial
+p039
 p039_type
 p039_value_initial
 
@@ -232,7 +274,9 @@ Response JSON - script_id
 
 
 
-GET /uploadscript/{script_id}/
+POST /executescript/{script_type_id}/
+
+Input Script File
 
 Status Code