From 4d7b98da44c89db08e415b11c521f85e16b6a02a Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Sat, 29 Aug 2020 13:57:37 +0530 Subject: split initial values --- .gitignore | 1 + blocks/blocks/xcosblocks/models.py | 160 +++++++++++++++---------------- blocks/blocks/xcosblocks/serializers.py | 80 ++++++++-------- blocks/blocks/xcosblocks/views.py | 3 +- docs/api.txt | 164 ++++++++++++++++---------------- 5 files changed, 205 insertions(+), 203 deletions(-) diff --git a/.gitignore b/.gitignore index 882ea560..349be2e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.pem *.pyc blocks/blocks/*/migrations/*.py blocks/*/migrations/*.py diff --git a/blocks/blocks/xcosblocks/models.py b/blocks/blocks/xcosblocks/models.py index fd3c42a7..0d9ca920 100644 --- a/blocks/blocks/xcosblocks/models.py +++ b/blocks/blocks/xcosblocks/models.py @@ -38,6 +38,86 @@ class Block(models.Model): initial_control_ports = models.IntegerField() initial_command_ports = models.IntegerField() initial_display_parameter = models.CharField(max_length=100) + p000_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p001_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p002_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p003_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p004_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p005_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p006_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p007_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p008_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p009_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p010_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p011_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p012_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p013_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p014_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p015_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p016_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p017_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p018_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p019_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p020_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p021_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p022_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p023_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p024_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p025_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p026_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p027_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p028_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p029_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p030_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p031_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p032_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p033_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p034_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p035_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p036_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p037_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p038_value_initial = models.CharField(max_length=100, + blank=True, null=True) + p039_value_initial = models.CharField(max_length=100, + blank=True, null=True) def __str__(self): """String for representing the Model object.""" @@ -55,203 +135,123 @@ class BlockParameter(models.Model): 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) - p000_value_initial = models.CharField(max_length=100, - blank=True, null=True) p001 = models.CharField(max_length=100, blank=True, null=True) p001_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p001_value_initial = models.CharField(max_length=100, - blank=True, null=True) p002 = models.CharField(max_length=100, blank=True, null=True) p002_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p002_value_initial = models.CharField(max_length=100, - blank=True, null=True) p003 = models.CharField(max_length=100, blank=True, null=True) p003_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p003_value_initial = models.CharField(max_length=100, - blank=True, null=True) p004 = models.CharField(max_length=100, blank=True, null=True) p004_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p004_value_initial = models.CharField(max_length=100, - blank=True, null=True) p005 = models.CharField(max_length=100, blank=True, null=True) p005_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p005_value_initial = models.CharField(max_length=100, - blank=True, null=True) p006 = models.CharField(max_length=100, blank=True, null=True) p006_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p006_value_initial = models.CharField(max_length=100, - blank=True, null=True) p007 = models.CharField(max_length=100, blank=True, null=True) p007_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p007_value_initial = models.CharField(max_length=100, - blank=True, null=True) p008 = models.CharField(max_length=100, blank=True, null=True) p008_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p008_value_initial = models.CharField(max_length=100, - blank=True, null=True) p009 = models.CharField(max_length=100, blank=True, null=True) p009_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p009_value_initial = models.CharField(max_length=100, - blank=True, null=True) p010 = models.CharField(max_length=100, blank=True, null=True) p010_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p010_value_initial = models.CharField(max_length=100, - blank=True, null=True) p011 = models.CharField(max_length=100, blank=True, null=True) p011_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p011_value_initial = models.CharField(max_length=100, - blank=True, null=True) p012 = models.CharField(max_length=100, blank=True, null=True) p012_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p012_value_initial = models.CharField(max_length=100, - blank=True, null=True) p013 = models.CharField(max_length=100, blank=True, null=True) p013_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p013_value_initial = models.CharField(max_length=100, - blank=True, null=True) p014 = models.CharField(max_length=100, blank=True, null=True) p014_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p014_value_initial = models.CharField(max_length=100, - blank=True, null=True) p015 = models.CharField(max_length=100, blank=True, null=True) p015_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p015_value_initial = models.CharField(max_length=100, - blank=True, null=True) p016 = models.CharField(max_length=100, blank=True, null=True) p016_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p016_value_initial = models.CharField(max_length=100, - blank=True, null=True) p017 = models.CharField(max_length=100, blank=True, null=True) p017_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p017_value_initial = models.CharField(max_length=100, - blank=True, null=True) p018 = models.CharField(max_length=100, blank=True, null=True) p018_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p018_value_initial = models.CharField(max_length=100, - blank=True, null=True) p019 = models.CharField(max_length=100, blank=True, null=True) p019_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p019_value_initial = models.CharField(max_length=100, - blank=True, null=True) p020 = models.CharField(max_length=100, blank=True, null=True) p020_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p020_value_initial = models.CharField(max_length=100, - blank=True, null=True) p021 = models.CharField(max_length=100, blank=True, null=True) p021_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p021_value_initial = models.CharField(max_length=100, - blank=True, null=True) p022 = models.CharField(max_length=100, blank=True, null=True) p022_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p022_value_initial = models.CharField(max_length=100, - blank=True, null=True) p023 = models.CharField(max_length=100, blank=True, null=True) p023_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p023_value_initial = models.CharField(max_length=100, - blank=True, null=True) p024 = models.CharField(max_length=100, blank=True, null=True) p024_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p024_value_initial = models.CharField(max_length=100, - blank=True, null=True) p025 = models.CharField(max_length=100, blank=True, null=True) p025_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p025_value_initial = models.CharField(max_length=100, - blank=True, null=True) p026 = models.CharField(max_length=100, blank=True, null=True) p026_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p026_value_initial = models.CharField(max_length=100, - blank=True, null=True) p027 = models.CharField(max_length=100, blank=True, null=True) p027_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p027_value_initial = models.CharField(max_length=100, - blank=True, null=True) p028 = models.CharField(max_length=100, blank=True, null=True) p028_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p028_value_initial = models.CharField(max_length=100, - blank=True, null=True) p029 = models.CharField(max_length=100, blank=True, null=True) p029_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p029_value_initial = models.CharField(max_length=100, - blank=True, null=True) p030 = models.CharField(max_length=100, blank=True, null=True) p030_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p030_value_initial = models.CharField(max_length=100, - blank=True, null=True) p031 = models.CharField(max_length=100, blank=True, null=True) p031_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p031_value_initial = models.CharField(max_length=100, - blank=True, null=True) p032 = models.CharField(max_length=100, blank=True, null=True) p032_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p032_value_initial = models.CharField(max_length=100, - blank=True, null=True) p033 = models.CharField(max_length=100, blank=True, null=True) p033_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p033_value_initial = models.CharField(max_length=100, - blank=True, null=True) p034 = models.CharField(max_length=100, blank=True, null=True) p034_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p034_value_initial = models.CharField(max_length=100, - blank=True, null=True) p035 = models.CharField(max_length=100, blank=True, null=True) p035_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p035_value_initial = models.CharField(max_length=100, - blank=True, null=True) p036 = models.CharField(max_length=100, blank=True, null=True) p036_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p036_value_initial = models.CharField(max_length=100, - blank=True, null=True) p037 = models.CharField(max_length=100, blank=True, null=True) p037_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p037_value_initial = models.CharField(max_length=100, - blank=True, null=True) p038 = models.CharField(max_length=100, blank=True, null=True) p038_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p038_value_initial = models.CharField(max_length=100, - blank=True, null=True) p039 = models.CharField(max_length=100, blank=True, null=True) p039_type = models.ForeignKey(ParameterDataType, on_delete=models.PROTECT, related_name='+', blank=True, null=True) - p039_value_initial = models.CharField(max_length=100, - blank=True, null=True) def __str__(self): """String for representing the Model object.""" diff --git a/blocks/blocks/xcosblocks/serializers.py b/blocks/blocks/xcosblocks/serializers.py index 4f3edc92..259f25d1 100644 --- a/blocks/blocks/xcosblocks/serializers.py +++ b/blocks/blocks/xcosblocks/serializers.py @@ -47,6 +47,46 @@ class BlockSerializer(serializers.ModelSerializer): 'initial_control_ports', 'initial_command_ports', 'initial_display_parameter', + 'p000_value_initial', + 'p001_value_initial', + 'p002_value_initial', + 'p003_value_initial', + 'p004_value_initial', + 'p005_value_initial', + 'p006_value_initial', + 'p007_value_initial', + 'p008_value_initial', + 'p009_value_initial', + 'p010_value_initial', + 'p011_value_initial', + 'p012_value_initial', + 'p013_value_initial', + 'p014_value_initial', + 'p015_value_initial', + 'p016_value_initial', + 'p017_value_initial', + 'p018_value_initial', + 'p019_value_initial', + 'p020_value_initial', + 'p021_value_initial', + 'p022_value_initial', + 'p023_value_initial', + 'p024_value_initial', + 'p025_value_initial', + 'p026_value_initial', + 'p027_value_initial', + 'p028_value_initial', + 'p029_value_initial', + 'p030_value_initial', + 'p031_value_initial', + 'p032_value_initial', + 'p033_value_initial', + 'p034_value_initial', + 'p035_value_initial', + 'p036_value_initial', + 'p037_value_initial', + 'p038_value_initial', + 'p039_value_initial', ] @@ -58,122 +98,82 @@ class BlockParameterSerializer(serializers.ModelSerializer): 'block', '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', ] diff --git a/blocks/blocks/xcosblocks/views.py b/blocks/blocks/xcosblocks/views.py index 36a2d792..4a8f87a4 100644 --- a/blocks/blocks/xcosblocks/views.py +++ b/blocks/blocks/xcosblocks/views.py @@ -31,6 +31,7 @@ class BlockFilterSet(FilterSet): class Meta: model = Block fields = { + 'id': ['exact'], 'name': ['istartswith'], 'categories': ['exact'], } @@ -58,7 +59,7 @@ class BlockParameterFilterSet(FilterSet): class BlockParameterViewSet(ReadOnlyModelViewSet): """ - Listing All Block Details + Listing All Block Parameter Details """ queryset = BlockParameter.objects.all() serializer_class = BlockParameterSerializer diff --git a/docs/api.txt b/docs/api.txt index 29b11ac1..db033bdf 100644 --- a/docs/api.txt +++ b/docs/api.txt @@ -32,10 +32,50 @@ initial_control_ports initial_command_ports initial_display_parameter block_image +p000_value_initial +p001_value_initial +p002_value_initial +p003_value_initial +p004_value_initial +p005_value_initial +p006_value_initial +p007_value_initial +p008_value_initial +p009_value_initial +p010_value_initial +p011_value_initial +p012_value_initial +p013_value_initial +p014_value_initial +p015_value_initial +p016_value_initial +p017_value_initial +p018_value_initial +p019_value_initial +p020_value_initial +p021_value_initial +p022_value_initial +p023_value_initial +p024_value_initial +p025_value_initial +p026_value_initial +p027_value_initial +p028_value_initial +p029_value_initial +p030_value_initial +p031_value_initial +p032_value_initial +p033_value_initial +p034_value_initial +p035_value_initial +p036_value_initial +p037_value_initial +p038_value_initial +p039_value_initial -GET /block_parameter/ +GET /block_parameters/ Status Code @@ -46,172 +86,132 @@ 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 -POST /set_this_block_parameter/{this_block_id}/ +POST /set_block_parameters/ Input JSON - Map of block_id -p000 -p001 -p002 -p003 -p004 -p005 -p006 -p007 -p008 -p009 -p010 -p011 -p012 -p013 -p014 -p015 -p016 -p017 -p018 -p019 -p020 -p021 -p022 -p023 -p024 -p025 -p026 -p027 -p028 -p029 -p030 -p031 -p032 -p033 -p034 -p035 -p036 -p037 -p038 -p039 +p000_value +p001_value +p002_value +p003_value +p004_value +p005_value +p006_value +p007_value +p008_value +p009_value +p010_value +p011_value +p012_value +p013_value +p014_value +p015_value +p016_value +p017_value +p018_value +p019_value +p020_value +p021_value +p022_value +p023_value +p024_value +p025_value +p026_value +p027_value +p028_value +p029_value +p030_value +p031_value +p032_value +p033_value +p034_value +p035_value +p036_value +p037_value +p038_value +p039_value Status Code -- cgit