Remove useless column checkbox

geotrek/core/serializers.py

@@ -30,7 +30,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta):
 
 
 class TrailSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     length = serializers.FloatField(source='length_display')
     name = serializers.CharField(source='name_display')
     category = serializers.SlugRelatedField('label', read_only=True)

geotrek/core/tests/test_views.py

@@ -714,7 +714,7 @@ class TrailViewsTest(CommonTest):
         'coordinates': [[3.0, 46.5], [3.001304, 46.5009004]],
     }
     extra_column_list = ['length', 'eid', 'departure', 'arrival']
-    expected_column_list_extra = ['id', 'checkbox', 'name', 'length', 'eid', 'departure', 'arrival']
+    expected_column_list_extra = ['id', 'name', 'length', 'eid', 'departure', 'arrival']
     expected_column_formatlist_extra = ['id', 'length', 'eid', 'departure', 'arrival']
 
     def get_expected_json_attrs(self):
@@ -731,8 +731,7 @@ def get_expected_datatables_attrs(self):
             'departure': self.obj.departure,
             'id': self.obj.pk,
             'length': round(self.obj.length, 1),
-            'name': self.obj.name_display,
-            'checkbox': self.obj.checkbox_display
+            'name': self.obj.name_display
         }
 
     def get_good_data(self):

geotrek/core/views.py

@@ -346,10 +346,9 @@ class CertificationTrailMixin(FormsetMixin):
 class TrailList(CustomColumnsMixin, MapEntityList):
     queryset = Trail.objects.existing()
     filterform = TrailFilterSet
-    mandatory_columns = ['id', 'checkbox', 'name']
+    mandatory_columns = ['id', 'name']
     default_extra_columns = ['departure', 'arrival', 'length']
     searchable_columns = ['id', 'name', 'departure', 'arrival', ]
-    unorderable_columns = ['checkbox']
 
 
 class TrailFormatList(MapEntityFormat, TrailList):

geotrek/diving/serializers.py

@@ -48,7 +48,6 @@ class Meta:
 
 
 class DiveSerializer(DynamicFieldsMixin, rest_serializers.ModelSerializer):
-    checkbox = rest_serializers.CharField(source='checkbox_display')
     name = rest_serializers.CharField(source='name_display')
     thumbnail = rest_serializers.CharField(source='thumbnail_display')
     levels = rest_serializers.CharField(source='levels_display')

geotrek/diving/tests/test_views.py

@@ -19,7 +19,7 @@ class DiveViewsTests(GeotrekAPITestCase, CommonTest):
         'coordinates': [-1.3630812, -5.9838563],
     }
     extra_column_list = ['depth', 'advice']
-    expected_column_list_extra = ['id', 'checkbox', 'name', 'depth', 'advice']
+    expected_column_list_extra = ['id', 'name', 'depth', 'advice']
     expected_column_formatlist_extra = ['id', 'depth', 'advice']
 
     def get_expected_json_attrs(self):
@@ -85,7 +85,6 @@ def get_expected_datatables_attrs(self):
             'levels': self.obj.levels_display,
             'name': self.obj.name_display,
             'thumbnail': 'None',
-            'checkbox': self.obj.checkbox_display
         }
 
     def get_bad_data(self):

geotrek/diving/views.py

@@ -28,9 +28,9 @@
 class DiveList(CustomColumnsMixin, FlattenPicturesMixin, MapEntityList):
     filterform = DiveFilterSet
     queryset = Dive.objects.existing()
-    mandatory_columns = ['id', 'checkbox', 'name']
+    mandatory_columns = ['id', 'name']
     default_extra_columns = ['levels', 'thumbnail']
-    unorderable_columns = ['checkbox', 'thumbnail']
+    unorderable_columns = ['thumbnail']
     searchable_columns = ['id', 'name']
 
 

geotrek/infrastructure/serializers.py

@@ -16,7 +16,6 @@ class Meta:
 
 
 class InfrastructureSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     name = serializers.CharField(source='name_display')
     type = serializers.CharField(source='type_display')
     condition = serializers.SlugRelatedField('label', read_only=True)

geotrek/infrastructure/tests/test_views.py

@@ -33,7 +33,7 @@ class InfrastructureViewsTest(GeotrekAPITestCase, CommonTest):
     userfactory = PathManagerFactory
     expected_json_geom = {'type': 'LineString', 'coordinates': [[3.0, 46.5], [3.001304, 46.5009004]]}
     extra_column_list = ['type', 'eid']
-    expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid']
+    expected_column_list_extra = ['id', 'name', 'type', 'eid']
     expected_column_formatlist_extra = ['id', 'type', 'eid']
 
     def get_expected_json_attrs(self):
@@ -64,7 +64,6 @@ def get_expected_datatables_attrs(self):
             'cities': '[]',
             'condition': self.obj.condition.label,
             'id': self.obj.pk,
-            'checkbox': self.obj.checkbox_display,
             'name': self.obj.name_display,
             'type': self.obj.type.label,
         }
@@ -108,7 +107,7 @@ class PointInfrastructureViewsTest(InfrastructureViewsTest):
     modelfactory = PointInfrastructureFactory
     expected_json_geom = {'type': 'Point', 'coordinates': [3.0, 46.5]}
     extra_column_list = ['type', 'eid']
-    expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid']
+    expected_column_list_extra = ['id', 'name', 'type', 'eid']
     expected_column_formatlist_extra = ['id', 'type', 'eid']
 
     def get_good_data(self):

geotrek/infrastructure/views.py

@@ -19,10 +19,9 @@
 class InfrastructureList(CustomColumnsMixin, MapEntityList):
     queryset = Infrastructure.objects.existing()
     filterform = InfrastructureFilterSet
-    mandatory_columns = ['id', 'checkbox', 'name']
+    mandatory_columns = ['id', 'name']
     default_extra_columns = ['type', 'condition', 'cities']
     searchable_columns = ['id', 'name']
-    unorderable_columns = ['checkbox']
 
 
 class InfrastructureFormatList(MapEntityFormat, InfrastructureList):

geotrek/land/serializers.py

@@ -6,7 +6,6 @@
 
 
 class LandEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     land_type = serializers.CharField(source='land_type_display')
     length = serializers.FloatField(source='length_display')
     length_2d = serializers.FloatField(source='length_2d_display')
@@ -26,7 +25,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta):
 
 
 class PhysicalEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     physical_type = serializers.CharField(source='physical_type_display')
     length = serializers.FloatField(source='length_display')
     length_2d = serializers.FloatField(source='length_2d_display')
@@ -46,7 +44,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta):
 
 
 class CompetenceEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     organization = serializers.CharField(source='organization_display')
     length = serializers.FloatField(source='length_display')
     length_2d = serializers.FloatField(source='length_2d_display')
@@ -66,7 +63,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta):
 
 
 class SignageManagementEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     organization = serializers.CharField(source='organization_display')
     length = serializers.FloatField(source='length_display')
     length_2d = serializers.FloatField(source='length_2d_display')
@@ -86,7 +82,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta):
 
 
 class WorkManagementEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     organization = serializers.CharField(source='organization_display')
     length = serializers.FloatField(source='length_display')
     length_2d = serializers.FloatField(source='length_2d_display')

geotrek/land/tests/test_views.py

@@ -73,7 +73,7 @@ class PhysicalEdgeViewsTest(CommonTest):
     userfactory = PathManagerFactory
     get_expected_json_attrs = None  # Disable API tests
     extra_column_list = ['eid']
-    expected_column_list_extra = ['id', 'checkbox', 'physical_type', 'eid']
+    expected_column_list_extra = ['id', 'physical_type', 'eid']
     expected_column_formatlist_extra = ['id', 'physical_type', 'eid']
 
     def get_good_data(self):
@@ -88,8 +88,7 @@ def get_expected_datatables_attrs(self):
             'id': self.obj.pk,
             'length': round(self.obj.length, 1),
             'physical_type': self.obj.physical_type_display,
-            'length_2d': round(self.obj.length, 1),
-            'checkbox': self.obj.checkbox_display
+            'length_2d': round(self.obj.length, 1)
         }
 
 
@@ -100,7 +99,7 @@ class LandEdgeViewsTest(CommonTest):
     userfactory = PathManagerFactory
     get_expected_json_attrs = None  # Disable API tests
     extra_column_list = ['owner', 'agreement']
-    expected_column_list_extra = ['id', 'checkbox', 'land_type', 'owner', 'agreement']
+    expected_column_list_extra = ['id', 'land_type', 'owner', 'agreement']
     expected_column_formatlist_extra = ['id', 'owner', 'agreement']
 
     def get_good_data(self):
@@ -115,8 +114,7 @@ def get_expected_datatables_attrs(self):
             'id': self.obj.pk,
             'land_type': self.obj.land_type_display,
             'length': round(self.obj.length, 1),
-            'length_2d': round(self.obj.length, 1),
-            'checkbox': self.obj.checkbox_display
+            'length_2d': round(self.obj.length, 1)
         }
 
 
@@ -127,7 +125,7 @@ class CompetenceEdgeViewsTest(CommonTest):
     userfactory = PathManagerFactory
     get_expected_json_attrs = None  # Disable API tests
     extra_column_list = ['eid']
-    expected_column_list_extra = ['id', 'checkbox', 'organization', 'eid']
+    expected_column_list_extra = ['id', 'organization', 'eid']
     expected_column_formatlist_extra = ['id', 'organization', 'eid']
 
     def get_good_data(self):
@@ -142,8 +140,7 @@ def get_expected_datatables_attrs(self):
             'id': self.obj.pk,
             'length': round(self.obj.length, 1),
             'organization': self.obj.organization_display,
-            'length_2d': round(self.obj.length, 1),
-            'checkbox': self.obj.checkbox_display
+            'length_2d': round(self.obj.length, 1)
         }
 
 
@@ -154,7 +151,7 @@ class WorkManagementEdgeViewsTest(CommonTest):
     userfactory = PathManagerFactory
     get_expected_json_attrs = None  # Disable API tests
     extra_column_list = ['eid']
-    expected_column_list_extra = ['id', 'checkbox', 'organization', 'eid']
+    expected_column_list_extra = ['id', 'organization', 'eid']
     expected_column_formatlist_extra = ['id', 'organization', 'eid']
 
     def get_good_data(self):
@@ -169,8 +166,7 @@ def get_expected_datatables_attrs(self):
             'id': self.obj.pk,
             'length': round(self.obj.length, 1),
             'organization': self.obj.organization_display,
-            'length_2d': round(self.obj.length, 1),
-            'checkbox': self.obj.checkbox_display
+            'length_2d': round(self.obj.length, 1)
         }
 
 
@@ -181,7 +177,7 @@ class SignageManagementEdgeViewsTest(CommonTest):
     userfactory = PathManagerFactory
     get_expected_json_attrs = None  # Disable API tests
     extra_column_list = ['eid']
-    expected_column_list_extra = ['id', 'checkbox', 'organization', 'eid']
+    expected_column_list_extra = ['id', 'organization', 'eid']
     expected_column_formatlist_extra = ['id', 'organization', 'eid']
 
     def get_good_data(self):
@@ -196,6 +192,5 @@ def get_expected_datatables_attrs(self):
             'id': self.obj.pk,
             'length': round(self.obj.length, 1),
             'organization': self.obj.organization_display,
-            'length_2d': round(self.obj.length, 1),
-            'checkbox': self.obj.checkbox_display
+            'length_2d': round(self.obj.length, 1)
         }

geotrek/land/views.py

@@ -21,9 +21,8 @@
 class PhysicalEdgeList(CustomColumnsMixin, CreateFromTopologyMixin, MapEntityList):
     queryset = PhysicalEdge.objects.existing()
     filterform = PhysicalEdgeFilterSet
-    mandatory_columns = ['id', 'checkbox', 'physical_type']
+    mandatory_columns = ['id', 'physical_type']
     default_extra_columns = ['length', 'length_2d']
-    unorderable_columns = ['checkbox']
 
 
 class PhysicalEdgeFormatList(MapEntityFormat, PhysicalEdgeList):
@@ -80,9 +79,8 @@ def get_queryset(self):
 class LandEdgeList(CustomColumnsMixin, MapEntityList):
     queryset = LandEdge.objects.existing()
     filterform = LandEdgeFilterSet
-    mandatory_columns = ['id', 'checkbox', 'land_type']
+    mandatory_columns = ['id', 'land_type']
     default_extra_columns = ['length', 'length_2d']
-    unorderable_columns = ['checkbox']
 
 
 class LandEdgeFormatList(MapEntityFormat, LandEdgeList):
@@ -137,9 +135,8 @@ def get_queryset(self):
 class CompetenceEdgeList(CustomColumnsMixin, MapEntityList):
     queryset = CompetenceEdge.objects.existing()
     filterform = CompetenceEdgeFilterSet
-    mandatory_columns = ['id', 'checkbox', 'organization']
+    mandatory_columns = ['id', 'organization']
     default_extra_columns = ['length', 'length_2d']
-    unorderable_columns = ['checkbox']
 
 
 class CompetenceEdgeFormatList(MapEntityFormat, CompetenceEdgeList):
@@ -194,9 +191,8 @@ def get_queryset(self):
 class WorkManagementEdgeList(CustomColumnsMixin, MapEntityList):
     queryset = WorkManagementEdge.objects.existing()
     filterform = WorkManagementEdgeFilterSet
-    mandatory_columns = ['id', 'checkbox', 'organization']
+    mandatory_columns = ['id', 'organization']
     default_extra_columns = ['length', 'length_2d']
-    unorderable_columns = ['checkbox']
 
 
 class WorkManagementEdgeFormatList(MapEntityFormat, WorkManagementEdgeList):
@@ -250,9 +246,8 @@ def get_queryset(self):
 class SignageManagementEdgeList(CustomColumnsMixin, MapEntityList):
     queryset = SignageManagementEdge.objects.existing()
     filterform = SignageManagementEdgeFilterSet
-    mandatory_columns = ['id', 'checkbox', 'organization']
+    mandatory_columns = ['id', 'organization']
     default_extra_columns = ['length', 'length_2d']
-    unorderable_columns = ['checkbox']
 
 
 class SignageManagementEdgeFormatList(MapEntityFormat, SignageManagementEdgeList):

geotrek/maintenance/serializers.py

@@ -6,7 +6,6 @@
 
 
 class InterventionSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     name = serializers.CharField(source='name_display')
     stake = serializers.SlugRelatedField(slug_field='stake', read_only=True)
     status = serializers.SlugRelatedField(slug_field='status', read_only=True)

geotrek/maintenance/tests/test_views.py

@@ -45,7 +45,7 @@ class InterventionViewsTest(CommonTest):
     userfactory = PathManagerFactory
     get_expected_json_attrs = None  # Disable API tests
     extra_column_list = ['heliport_cost', 'subcontract_cost', 'disorders', 'jobs']
-    expected_column_list_extra = ['id', 'checkbox', 'name', 'heliport_cost', 'subcontract_cost', 'disorders', 'jobs']
+    expected_column_list_extra = ['id', 'name', 'heliport_cost', 'subcontract_cost', 'disorders', 'jobs']
     expected_column_formatlist_extra = ['id', 'heliport_cost', 'subcontract_cost', 'disorders', 'jobs']
 
     def get_bad_data(self):
@@ -104,8 +104,7 @@ def get_expected_datatables_attrs(self):
             'stake': self.obj.stake.stake,
             'status': self.obj.status.status,
             'type': self.obj.type.type,
-            'target': self.obj.target_display,
-            'checkbox': self.obj.checkbox_display
+            'target': self.obj.target_display
         }
 
     def test_creation_form_on_signage(self):

geotrek/maintenance/views.py

@@ -25,10 +25,9 @@
 class InterventionList(CustomColumnsMixin, MapEntityList):
     queryset = Intervention.objects.existing()
     filterform = InterventionFilterSet
-    mandatory_columns = ['id', 'checkbox', 'name']
+    mandatory_columns = ['id', 'name']
     default_extra_columns = ['date', 'type', 'target', 'status', 'stake']
     searchable_columns = ['id', 'name']
-    unorderable_columns = ['checkbox']
 
 
 class InterventionFormatList(MapEntityFormat, InterventionList):

geotrek/outdoor/serializers.py

@@ -33,7 +33,6 @@ class Meta:
 
 
 class SiteSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     name = serializers.CharField(source='name_display')
     super_practices = serializers.CharField(source='super_practices_display')
     structure = serializers.SlugRelatedField('name', read_only=True)
@@ -81,7 +80,6 @@ class Meta(SiteAPISerializer.Meta):
 
 
 class CourseSerializer(DynamicFieldsMixin, serializers.ModelSerializer):
-    checkbox = serializers.CharField(source='checkbox_display')
     structure = serializers.SlugRelatedField('name', read_only=True)
     parent_sites = serializers.CharField(source='parent_sites_display')
     name = serializers.CharField(source='name_display')

geotrek/outdoor/tests/test_functional.py

@@ -84,7 +84,6 @@ def get_expected_datatables_attrs(self):
         return {
             'date_update': '17/03/2020 00:00:00',
             'id': self.obj.pk,
-            'checkbox': self.obj.checkbox_display,
             'name': self.obj.name_display,
             'super_practices': self.obj.super_practices_display
         }
@@ -95,7 +94,7 @@ def test_custom_columns_mixin_on_list(self):
             return
         with override_settings(COLUMNS_LISTS={f'outdoor_{self.model._meta.model_name}_view': self.extra_column_list}):
             self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns,
-                             ['id', 'checkbox', 'name', 'orientation', 'ratings', 'period'])
+                             ['id', 'name', 'orientation', 'ratings', 'period'])
 
     def test_custom_columns_mixin_on_export(self):
         # Assert columns equal mandatory columns plus custom extra columns
@@ -157,7 +156,6 @@ def get_expected_datatables_attrs(self):
         return {
             'date_update': '17/03/2020 00:00:00',
             'id': self.obj.pk,
-            'checkbox': self.obj.checkbox_display,
             'name': self.obj.name_display,
             'parent_sites': self.obj.parent_sites_display,
         }
@@ -182,7 +180,7 @@ def test_custom_columns_mixin_on_list(self):
             return
         with override_settings(COLUMNS_LISTS={f'outdoor_{self.model._meta.model_name}_view': self.extra_column_list}):
             self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns,
-                             ['id', 'checkbox', 'name', 'equipment', 'ratings', 'eid'])
+                             ['id', 'name', 'equipment', 'ratings', 'eid'])
 
     def test_custom_columns_mixin_on_export(self):
         # Assert columns equal mandatory columns plus custom extra columns