fixing the model as per api

break serializer into two

3 files changed, 21 insertions, 37 deletions

diff --git a/blocks/blocks/xcosblocks/models.py b/blocks/blocks/xcosblocks/models.py
index 8f67c24a..fd3c42a7 100644
--- a/blocks/blocks/xcosblocks/models.py
+++ b/blocks/blocks/xcosblocks/models.py
@@ -52,13 +52,6 @@ class Block(models.Model):
 
 class BlockParameter(models.Model):
     block = models.ForeignKey(Block, on_delete=models.PROTECT)
-    variable_explicit_input_ports = models.CharField(max_length=100)
-    variable_implicit_input_ports = models.CharField(max_length=100)
-    variable_explicit_output_ports = models.CharField(max_length=100)
-    variable_implicit_output_ports = models.CharField(max_length=100)
-    variable_control_ports = models.CharField(max_length=100)
-    variable_command_ports = models.CharField(max_length=100)
-    variable_display_parameter = models.CharField(max_length=100)
     p000 = models.CharField(max_length=100, blank=True, null=True)
     p000_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT,
                                   related_name='+', blank=True, null=True)
diff --git a/blocks/blocks/xcosblocks/serializers.py b/blocks/blocks/xcosblocks/serializers.py
index e737d17a..803d9430 100644
--- a/blocks/blocks/xcosblocks/serializers.py
+++ b/blocks/blocks/xcosblocks/serializers.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from .models import Category, ParameterDataType, Block
+from .models import Category, ParameterDataType, BlockType, Block, BlockParameter
 
 
 class CategorySerializer(serializers.ModelSerializer):
@@ -22,11 +22,21 @@ class ParameterDataTypeSerializer(serializers.ModelSerializer):
         ]
 
 
+class BlockTypeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = BlockType
+        fields = [
+            'id',
+            'name',
+        ]
+
+
 class BlockSerializer(serializers.ModelSerializer):
     class Meta:
         model = Block
         fields = [
             'id',
+            'blocktype',
             'name',
             'categories',
             'initial_explicit_input_ports',
@@ -36,13 +46,15 @@ class BlockSerializer(serializers.ModelSerializer):
             'initial_control_ports',
             'initial_command_ports',
             'initial_display_parameter',
-            'variable_explicit_input_ports',
-            'variable_implicit_input_ports',
-            'variable_explicit_output_ports',
-            'variable_implicit_output_ports',
-            'variable_control_ports',
-            'variable_command_ports',
-            'variable_display_parameter',
+        ]
+
+
+class BlockParameterSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = BlockParameter
+        fields = [
+            'id',
+            'block',
             'p000',
             'p000_type',
             'p000_value_initial',
diff --git a/docs/api.txt b/docs/api.txt
index d689fb6d..63218f73 100644
--- a/docs/api.txt
+++ b/docs/api.txt
@@ -12,7 +12,7 @@ sort_order
 
 
 
-GET /blocks/?categories={category_id}
+GET /blocks/
 
 Status Code
 
@@ -33,27 +33,6 @@ block_image
 
 
 
-GET /blocks/?name__istartswith={string}
-
-Status Code
-
-200
-
-Response JSON - Array of maps of
-
-id
-name
-initial_explicit_input_ports
-initial_implicit_input_ports
-initial_explicit_output_ports
-initial_implicit_output_ports
-initial_control_ports
-initial_command_ports
-initial_display_parameter
-initial_block_image
-
-
-
 GET /block_parameter/{block_id}/
 
 Status Code