Merged master and company migrations

InvenTree/part/admin.py

@@ -16,8 +16,6 @@ from .models import PartCategoryParameterTemplate
 from .models import PartTestTemplate
 from .models import PartSellPriceBreak
 
-from InvenTree.helpers import normalize
-
 from stock.models import StockLocation
 from company.models import SupplierPart
 
@@ -180,7 +178,7 @@ class BomItemResource(ModelResource):
 
         Ref: https://django-import-export.readthedocs.io/en/latest/getting_started.html#advanced-data-manipulation-on-export
         """
-        return normalize(item.quantity)
+        return float(item.quantity)
 
     def before_export(self, queryset, *args, **kwargs):
 

InvenTree/part/api.py

@@ -735,6 +735,15 @@ class PartParameterList(generics.ListCreateAPIView):
     ]
 
 
+class PartParameterDetail(generics.RetrieveUpdateDestroyAPIView):
+    """
+    API endpoint for detail view of a single PartParameter object
+    """
+
+    queryset = PartParameter.objects.all()
+    serializer_class = part_serializers.PartParameterSerializer
+
+
 class BomList(generics.ListCreateAPIView):
     """ API endpoint for accessing a list of BomItem objects.
 
@@ -942,6 +951,8 @@ part_api_urls = [
     # Base URL for PartParameter API endpoints
     url(r'^parameter/', include([
         url(r'^template/$', PartParameterTemplateList.as_view(), name='api-part-param-template-list'),
+
+        url(r'^(?P<pk>\d+)/', PartParameterDetail.as_view(), name='api-part-param-detail'),
         url(r'^.*$', PartParameterList.as_view(), name='api-part-param-list'),
     ])),
 

InvenTree/part/apps.py

@@ -9,7 +9,7 @@ from django.conf import settings
 
 from PIL import UnidentifiedImageError
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("inventree")
 
 
 class PartConfig(AppConfig):

InvenTree/part/fixtures/params.yaml

@@ -33,6 +33,27 @@
     template: 1
     data: 12
 
+- model: part.PartParameter
+  pk: 3
+  fields:
+    part: 3
+    template: 1
+    data: 12
+
+- model: part.PartParameter
+  pk: 4
+  fields:
+    part: 3
+    template: 2
+    data: 12
+
+- model: part.PartParameter
+  pk: 5
+  fields:
+    part: 3
+    template: 3
+    data: 12
+
 # Add some template parameters to categories (requires category.yaml)
 - model: part.PartCategoryParameterTemplate
   pk: 1

InvenTree/part/models.py

@@ -52,7 +52,7 @@ import common.models
 import part.settings as part_settings
 
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("inventree")
 
 
 class PartCategory(InvenTreeTree):

InvenTree/part/templates/part/stock.html

@@ -40,7 +40,7 @@
         params: {
             part: {{ part.id }},
             location_detail: true,
-            part_detail: true,
+            part_detail: false,
         },
         groupByField: 'location',
         buttons: [

InvenTree/part/test_api.py

@@ -325,3 +325,106 @@ class PartAPIAggregationTest(InvenTreeAPITestCase):
 
         self.assertEqual(data['in_stock'], 1100)
         self.assertEqual(data['stock_item_count'], 105)
+
+
+class PartParameterTest(InvenTreeAPITestCase):
+    """
+    Tests for the ParParameter API
+    """
+
+    superuser = True
+
+    fixtures = [
+        'category',
+        'part',
+        'location',
+        'params',
+    ]
+
+    def setUp(self):
+
+        super().setUp()
+
+    def test_list_params(self):
+        """
+        Test for listing part parameters
+        """
+
+        url = reverse('api-part-param-list')
+
+        response = self.client.get(url, format='json')
+
+        self.assertEqual(len(response.data), 5)
+
+        # Filter by part
+        response = self.client.get(
+            url,
+            {
+                'part': 3,
+            },
+            format='json'
+        )
+
+        self.assertEqual(len(response.data), 3)
+
+        # Filter by template
+        response = self.client.get(
+            url,
+            {
+                'template': 1,
+            },
+            format='json',
+        )
+
+        self.assertEqual(len(response.data), 3)
+
+    def test_create_param(self):
+        """
+        Test that we can create a param via the API
+        """
+
+        url = reverse('api-part-param-list')
+
+        response = self.client.post(
+            url,
+            {
+                'part': '2',
+                'template': '3',
+                'data': 70
+            }
+        )
+
+        self.assertEqual(response.status_code, 201)
+
+        response = self.client.get(url, format='json')
+
+        self.assertEqual(len(response.data), 6)
+
+    def test_param_detail(self):
+        """
+        Tests for the PartParameter detail endpoint
+        """
+
+        url = reverse('api-part-param-detail', kwargs={'pk': 5})
+
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 200)
+
+        data = response.data
+
+        self.assertEqual(data['pk'], 5)
+        self.assertEqual(data['part'], 3)
+        self.assertEqual(data['data'], '12')
+
+        # PATCH data back in
+        response = self.client.patch(url, {'data': '15'}, format='json')
+
+        self.assertEqual(response.status_code, 200)
+        
+        # Check that the data changed!
+        response = self.client.get(url, format='json')
+
+        data = response.data
+
+        self.assertEqual(data['data'], '15')