Build system updates

InvenTree/InvenTree/helpers.py

@@ -337,7 +337,7 @@ def DownloadFile(data, filename, content_type='application/text'):
     return response
 
 
-def ExtractSerialNumbers(serials, expected_quantity):
+def extract_serial_numbers(serials, expected_quantity):
     """ Attempt to extract serial numbers from an input string.
     - Serial numbers must be integer values
     - Serial numbers must be positive

InvenTree/InvenTree/static/script/inventree/inventree.js

@@ -134,20 +134,35 @@ function makeProgressBar(value, maximum, opts={}) {
 
     var extraclass = '';
 
-    if (maximum) {
-        // TODO - Special color?
-    }
-    else if (value > maximum) {
+    if (value > maximum) {
         extraclass='progress-bar-over';
     } else if (value < maximum) {
         extraclass = 'progress-bar-under';
     }
 
-    var text = value;
+    var style = options.style || '';
+
+    var text = '';
+
+    if (style == 'percent') {
+        // Display e.g. "50%"
+
+        text = `${percent}%`;
+    } else if (style == 'max') {
+        // Display just the maximum value
+        text = `${maximum}`;
+    } else if (style == 'value') {
+        // Display just the current value
+        text = `${value}`;
+    } else if (style == 'blank') {
+        // No display!
+        text = '';
+    } else {
+        /* Default style
+        * Display e.g. "5 / 10"
+        */
 
-    if (maximum) {
-        text += ' / ';
-        text += maximum;
+        text = `${value} / ${maximum}`;
     }
 
     var id = options.id || 'progress-bar';

InvenTree/InvenTree/static/script/inventree/modals.js

@@ -134,6 +134,32 @@ function reloadFieldOptions(fieldName, options) {
 }
 
 
+function enableField(fieldName, enabled, options={}) {
+    /* Enable (or disable) a particular field in a modal.
+     * 
+     * Args:
+     * - fieldName: The name of the field
+     * - enabled: boolean enabled / disabled status
+     * - options:
+     */
+
+    var modal = options.modal || '#modal-form';
+
+    var field = getFieldByName(modal, fieldName);
+
+    field.prop("disabled", !enabled);
+}
+
+function clearField(fieldName, options={}) {
+
+    var modal = options.modal || '#modal-form';
+
+    var field = getFieldByName(modal, fieldName);
+
+    field.val("");
+}
+
+
 function partialMatcher(params, data) {
     /* Replacement function for the 'matcher' parameter for a select2 dropdown.
 
@@ -696,6 +722,11 @@ function handleModalForm(url, options) {
                     }
                     // Form was returned, invalid!
                     else {
+
+                        var warningDiv = $(modal).find('#form-validation-warning');
+
+                        warningDiv.css('display', 'block');
+
                         if (response.html_form) {
                             injectModalForm(modal, response.html_form);
 
@@ -813,8 +844,13 @@ function launchModalForm(url, options = {}) {
 
             $(modal).modal('hide');
 
-            // Permission denied!
-            if (xhr.status == 400) {
+            if (xhr.status == 0) {
+                // No response from the server
+                showAlertDialog(
+                    "No Response",
+                    "No response from the InvenTree server",
+                );
+            } else if (xhr.status == 400) {
                 showAlertDialog(
                     "Error 400: Bad Request",
                     "Server returned error code 400"

InvenTree/InvenTree/status_codes.py

@@ -214,25 +214,25 @@ class BuildStatus(StatusCode):
 
     # Build status codes
     PENDING = 10  # Build is pending / active
-    ALLOCATED = 20  # Parts have been removed from stock
+    PRODUCTION = 20  # BuildOrder is in production
     CANCELLED = 30  # Build was cancelled
     COMPLETE = 40  # Build is complete
 
     options = {
         PENDING: _("Pending"),
-        ALLOCATED: _("Allocated"),
+        PRODUCTION: _("Production"),
         CANCELLED: _("Cancelled"),
         COMPLETE: _("Complete"),
     }
 
     colors = {
         PENDING: 'blue',
-        ALLOCATED: 'blue',
+        PRODUCTION: 'blue',
         COMPLETE: 'green',
         CANCELLED: 'red',
     }
 
     ACTIVE_CODES = [
         PENDING,
-        ALLOCATED
+        PRODUCTION,
     ]

InvenTree/InvenTree/tests.py

@@ -210,7 +210,7 @@ class TestSerialNumberExtraction(TestCase):
 
     def test_simple(self):
 
-        e = helpers.ExtractSerialNumbers
+        e = helpers.extract_serial_numbers
 
         sn = e("1-5", 5)
         self.assertEqual(len(sn), 5)
@@ -226,7 +226,7 @@ def test_simple(self):
 
     def test_failures(self):
 
-        e = helpers.ExtractSerialNumbers
+        e = helpers.extract_serial_numbers
 
         # Test duplicates
         with self.assertRaises(ValidationError):

InvenTree/InvenTree/views.py

@@ -213,26 +213,6 @@ def get_data(self):
         """
         return {}
 
-    def pre_save(self, obj, form, **kwargs):
-        """
-        Hook for doing something *before* an object is saved.
-
-        obj: The object to be saved
-        form: The cleaned form
-        """
-
-        # Do nothing by default
-        pass
-
-    def post_save(self, obj, form, **kwargs):
-        """
-        Hook for doing something *after* an object is saved.
-
-        """
-
-        # Do nothing by default
-        pass
-
     def validate(self, obj, form, **kwargs):
         """
         Hook for performing custom form validation steps.
@@ -362,7 +342,7 @@ def get(self, request, *args, **kwargs):
         form = self.get_form()
         return self.renderJsonResponse(request, form)
 
-    def do_save(self, form):
+    def save(self, form):
         """
         Method for actually saving the form to the database.
         Default implementation is very simple,
@@ -393,7 +373,9 @@ def post(self, request, *args, **kwargs):
 
         # Extra JSON data sent alongside form
         data = {
-            'form_valid': valid
+            'form_valid': valid,
+            'form_errors': self.form.errors.as_json(),
+            'non_field_errors': self.form.non_field_errors().as_json(),
         }
 
         # Add in any extra class data
@@ -402,14 +384,8 @@ def post(self, request, *args, **kwargs):
 
         if valid:
 
-            # Perform (optional) pre-save step
-            self.pre_save(None, self.form)
-
             # Save the object to the database
-            self.do_save(self.form)
-
-            # Perform (optional) post-save step
-            self.post_save(self.object, self.form)
+            self.object = self.save(self.form)
 
             # Return the PK of the newly-created object
             data['pk'] = self.object.pk
@@ -440,11 +416,14 @@ def get(self, request, *args, **kwargs):
 
         return self.renderJsonResponse(request, self.get_form(), context=self.get_context_data())
 
-    def do_save(self, form):
+    def save(self, object, form, **kwargs):
         """
         Method for updating the object in the database.
-        Default implementation is very simple,
-        but can be overridden if required.
+        Default implementation is very simple, but can be overridden if required.
+
+        Args:
+            object - The current object, to be updated
+            form - The validated form
         """
 
         self.object = form.save()
@@ -476,7 +455,9 @@ def post(self, request, *args, **kwargs):
         valid = form.is_valid()
 
         data = {
-            'form_valid': valid
+            'form_valid': valid,
+            'form_errors': form.errors.as_json(),
+            'non_field_errors': form.non_field_errors().as_json(),
         }
 
         # Add in any extra class data
@@ -485,22 +466,16 @@ def post(self, request, *args, **kwargs):
 
         if valid:
 
-            # Perform (optional) pre-save step
-            self.pre_save(self.object, form)
-
             # Save the updated objec to the database
-            obj = self.do_save(form)
+            self.save(self.object, form)
 
-            # Perform (optional) post-save step
-            self.post_save(obj, form)
+            self.object = self.get_object()
 
             # Include context data about the updated object
-            data['pk'] = obj.pk
-
-            self.post_save(obj, form)
+            data['pk'] = self.object.pk
 
             try:
-                data['url'] = obj.get_absolute_url()
+                data['url'] = self.object.get_absolute_url()
             except AttributeError:
                 pass
 

InvenTree/build/api.py

@@ -52,14 +52,16 @@ def filter_queryset(self, queryset):
 
         queryset = super().filter_queryset(queryset)
 
+        params = self.request.query_params
+
         # Filter by build status?
-        status = self.request.query_params.get('status', None)
+        status = params.get('status', None)
 
         if status is not None:
             queryset = queryset.filter(status=status)
 
-        # Filter by "active" status
-        active = self.request.query_params.get('active', None)
+        # Filter by "pending" status
+        active = params.get('active', None)
 
         if active is not None:
             active = str2bool(active)
@@ -70,7 +72,7 @@ def filter_queryset(self, queryset):
                 queryset = queryset.exclude(status__in=BuildStatus.ACTIVE_CODES)
 
         # Filter by associated part?
-        part = self.request.query_params.get('part', None)
+        part = params.get('part', None)
 
         if part is not None:
             queryset = queryset.filter(part=part)
@@ -119,14 +121,23 @@ def get_queryset(self):
         return query
 
     def filter_queryset(self, queryset):
+
         queryset = super().filter_queryset(queryset)
 
+        params = self.request.query_params
+
         # Does the user wish to filter by part?
-        part_pk = self.request.query_params.get('part', None)
+        part_pk = params.get('part', None)
 
         if part_pk:
             queryset = queryset.filter(stock_item__part=part_pk)
 
+        # Filter by output target
+        output = params.get('output', None)
+
+        if output:
+            queryset = queryset.filter(install_into=output)
+
         return queryset
 
     filter_backends = [
@@ -135,7 +146,8 @@ def filter_queryset(self, queryset):
 
     filter_fields = [
         'build',
-        'stock_item'
+        'stock_item',
+        'install_into',
     ]
 
 

InvenTree/build/fixtures/build.yaml

@@ -31,4 +31,52 @@
     level: 0
     lft: 0
     rght: 0
-    tree_id: 1
+    tree_id: 1
+
+- model: build.build
+  pk: 3
+  fields:
+    part: 50
+    reference: "0003"
+    title: 'Making things'
+    batch: 'B2'
+    status: 40  # COMPLETE
+    quantity: 21
+    notes: 'Some even more simple notes'
+    creation_date: '2019-03-16'
+    level: 0
+    lft: 0
+    rght: 0
+    tree_id: 1
+
+- model: build.build
+  pk: 4
+  fields:
+    part: 50
+    reference: "0004"
+    title: 'Making things'
+    batch: 'B4'
+    status: 40  # COMPLETE
+    quantity: 21
+    notes: 'Some even even more simple notes'
+    creation_date: '2019-03-16'
+    level: 0
+    lft: 0
+    rght: 0
+    tree_id: 1
+
+- model: build.build
+  pk: 5
+  fields:
+    part: 25
+    reference: "0005"
+    title: "Building some Widgets"
+    batch: "B10"
+    status: 40 # Complete
+    quantity: 10
+    creation_date: '2019-03-16'
+    notes: "A thing"
+    level: 0
+    lft: 0
+    rght: 0
+    tree_id: 1