').append(html).appendTo(ul);
+ };
+ },
+ select: function( event, ui ) {
+ window.location = '/part/' + ui.item.id + '/';
+ },
+ minLength: 2,
+ classes: {
+ 'ui-autocomplete': 'dropdown-menu search-menu',
+ },
+ position: {
+ my : "right top",
+ at: "right bottom"
+ }
+ });
+ }
// Generate brand-icons
$('.brand-icon').each(function(i, obj) {
@@ -197,6 +205,9 @@ function inventreeDocReady() {
location.href = url;
});
+
+ // Display any cached alert messages
+ showCachedAlerts();
}
function isFileTransfer(transfer) {
diff --git a/InvenTree/InvenTree/static/script/inventree/notification.js b/InvenTree/InvenTree/static/script/inventree/notification.js
index 01754bceaf..399ba1d359 100644
--- a/InvenTree/InvenTree/static/script/inventree/notification.js
+++ b/InvenTree/InvenTree/static/script/inventree/notification.js
@@ -1,44 +1,113 @@
-function showAlert(target, message, timeout=5000) {
+/*
+ * Add a cached alert message to sesion storage
+ */
+function addCachedAlert(message, style) {
- $(target).find(".alert-msg").html(message);
- $(target).show();
- $(target).delay(timeout).slideUp(200, function() {
+ var alerts = sessionStorage.getItem('inventree-alerts');
+
+ if (alerts) {
+ alerts = JSON.parse(alerts);
+ } else {
+ alerts = [];
+ }
+
+ alerts.push({
+ message: message,
+ style: style
+ });
+
+ sessionStorage.setItem('inventree-alerts', JSON.stringify(alerts));
+}
+
+
+/*
+ * Remove all cached alert messages
+ */
+function clearCachedAlerts() {
+ sessionStorage.removeItem('inventree-alerts');
+}
+
+
+/*
+ * Display an alert, or cache to display on reload
+ */
+function showAlertOrCache(message, style, cache=false) {
+
+ if (cache) {
+ addCachedAlert(message, style);
+ } else {
+
+ showMessage(message, {style: style});
+ }
+}
+
+
+/*
+ * Display cached alert messages when loading a page
+ */
+function showCachedAlerts() {
+
+ var alerts = JSON.parse(sessionStorage.getItem('inventree-alerts')) || [];
+
+ alerts.forEach(function(alert) {
+ showMessage(alert.message, {style: alert.style});
+ });
+
+ clearCachedAlerts();
+}
+
+
+/*
+ * Display an alert message at the top of the screen.
+ * The message will contain a "close" button,
+ * and also dismiss automatically after a certain amount of time.
+ *
+ * arguments:
+ * - message: Text / HTML content to display
+ *
+ * options:
+ * - style: alert style e.g. 'success' / 'warning'
+ * - timeout: Time (in milliseconds) after which the message will be dismissed
+ */
+function showMessage(message, options={}) {
+
+ var style = options.style || 'info';
+
+ var timeout = options.timeout || 5000;
+
+ var details = '';
+
+ if (options.details) {
+ details = `
${options.details}
`;
+ }
+
+ // Hacky function to get the next available ID
+ var id = 1;
+
+ while ($(`#alert-${id}`).exists()) {
+ id++;
+ }
+
+ var icon = '';
+
+ if (options.icon) {
+ icon = ``;
+ }
+
+ // Construct the alert
+ var html = `
+
+ ${icon}
+ ${message}
+ ${details}
+
+
+ `;
+
+ $('#alerts').append(html);
+
+ // Remove the alert automatically after a specified period of time
+ $(`#alert-${id}`).delay(timeout).slideUp(200, function() {
$(this).alert(close);
});
}
-
-function showAlertOrCache(alertType, message, cache, timeout=5000) {
- if (cache) {
- sessionStorage.setItem("inventree-" + alertType, message);
- }
- else {
- showAlert('#' + alertType, message, timeout);
- }
-}
-
-function showCachedAlerts() {
-
- // Success Message
- if (sessionStorage.getItem("inventree-alert-success")) {
- showAlert("#alert-success", sessionStorage.getItem("inventree-alert-success"));
- sessionStorage.removeItem("inventree-alert-success");
- }
-
- // Info Message
- if (sessionStorage.getItem("inventree-alert-info")) {
- showAlert("#alert-info", sessionStorage.getItem("inventree-alert-info"));
- sessionStorage.removeItem("inventree-alert-info");
- }
-
- // Warning Message
- if (sessionStorage.getItem("inventree-alert-warning")) {
- showAlert("#alert-warning", sessionStorage.getItem("inventree-alert-warning"));
- sessionStorage.removeItem("inventree-alert-warning");
- }
-
- // Danger Message
- if (sessionStorage.getItem("inventree-alert-danger")) {
- showAlert("#alert-danger", sessionStorage.getItem("inventree-alert-danger"));
- sessionStorage.removeItem("inventree-alert-danger");
- }
-}
\ No newline at end of file
diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 2bd04b009b..e0c88c6b7e 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -98,7 +98,6 @@ settings_urls = [
# These javascript files are served "dynamically" - i.e. rendered on demand
dynamic_javascript_urls = [
- url(r'^inventree.js', DynamicJsView.as_view(template_name='js/dynamic/inventree.js'), name='inventree.js'),
url(r'^calendar.js', DynamicJsView.as_view(template_name='js/dynamic/calendar.js'), name='calendar.js'),
url(r'^nav.js', DynamicJsView.as_view(template_name='js/dynamic/nav.js'), name='nav.js'),
url(r'^settings.js', DynamicJsView.as_view(template_name='js/dynamic/settings.js'), name='settings.js'),
diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py
index 00f38ce89d..989fb1bc9d 100644
--- a/InvenTree/InvenTree/views.py
+++ b/InvenTree/InvenTree/views.py
@@ -655,17 +655,6 @@ class IndexView(TemplateView):
context = super(TemplateView, self).get_context_data(**kwargs)
- # TODO - Re-implement this when a less expensive method is worked out
- # context['starred'] = [star.part for star in self.request.user.starred_parts.all()]
-
- # Generate a list of orderable parts which have stock below their minimum values
- # TODO - Is there a less expensive way to get these from the database
- # context['to_order'] = [part for part in Part.objects.filter(purchaseable=True) if part.need_to_restock()]
-
- # Generate a list of assembly parts which have stock below their minimum values
- # TODO - Is there a less expensive way to get these from the database
- # context['to_build'] = [part for part in Part.objects.filter(assembly=True) if part.need_to_restock()]
-
return context
diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py
index 403b3a9430..0dd6a404e5 100644
--- a/InvenTree/build/models.py
+++ b/InvenTree/build/models.py
@@ -9,16 +9,16 @@ import decimal
import os
from datetime import datetime
-from django.utils.translation import ugettext_lazy as _
-
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
-
-from django.urls import reverse
+from django.core.validators import MinValueValidator
from django.db import models, transaction
from django.db.models import Sum, Q
from django.db.models.functions import Coalesce
-from django.core.validators import MinValueValidator
+from django.db.models.signals import post_save
+from django.dispatch.dispatcher import receiver
+from django.urls import reverse
+from django.utils.translation import ugettext_lazy as _
from markdownx.models import MarkdownxField
@@ -27,16 +27,17 @@ from mptt.exceptions import InvalidMove
from InvenTree.status_codes import BuildStatus, StockStatus, StockHistoryCode
from InvenTree.helpers import increment, getSetting, normalize, MakeBarcode
-from InvenTree.validators import validate_build_order_reference
from InvenTree.models import InvenTreeAttachment, ReferenceIndexingMixin
+from InvenTree.validators import validate_build_order_reference
import common.models
import InvenTree.fields
import InvenTree.helpers
+import InvenTree.tasks
-from stock import models as StockModels
from part import models as PartModels
+from stock import models as StockModels
from users import models as UserModels
@@ -1014,6 +1015,19 @@ class Build(MPTTModel, ReferenceIndexingMixin):
return self.status == BuildStatus.COMPLETE
+@receiver(post_save, sender=Build, dispatch_uid='build_post_save_log')
+def after_save_build(sender, instance: Build, created: bool, **kwargs):
+ """
+ Callback function to be executed after a Build instance is saved
+ """
+
+ if created:
+ # A new Build has just been created
+
+ # Run checks on required parts
+ InvenTree.tasks.offload_task('build.tasks.check_build_stock', instance)
+
+
class BuildOrderAttachment(InvenTreeAttachment):
"""
Model for storing file attachments against a BuildOrder object
diff --git a/InvenTree/build/tasks.py b/InvenTree/build/tasks.py
new file mode 100644
index 0000000000..6fe4be5119
--- /dev/null
+++ b/InvenTree/build/tasks.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from decimal import Decimal
+import logging
+
+from django.utils.translation import ugettext_lazy as _
+from django.template.loader import render_to_string
+
+from allauth.account.models import EmailAddress
+
+import build.models
+import InvenTree.helpers
+import InvenTree.tasks
+import part.models as part_models
+
+
+logger = logging.getLogger('inventree')
+
+
+def check_build_stock(build: build.models.Build):
+ """
+ Check the required stock for a newly created build order,
+ and send an email out to any subscribed users if stock is low.
+ """
+
+ # Iterate through each of the parts required for this build
+
+ lines = []
+
+ if not build:
+ logger.error("Invalid build passed to 'build.tasks.check_build_stock'")
+ return
+
+ try:
+ part = build.part
+ except part_models.Part.DoesNotExist:
+ # Note: This error may be thrown during unit testing...
+ logger.error("Invalid build.part passed to 'build.tasks.check_build_stock'")
+ return
+
+ for bom_item in part.get_bom_items():
+
+ sub_part = bom_item.sub_part
+
+ # The 'in stock' quantity depends on whether the bom_item allows variants
+ in_stock = sub_part.get_stock_count(include_variants=bom_item.allow_variants)
+
+ allocated = sub_part.allocation_count()
+
+ available = max(0, in_stock - allocated)
+
+ required = Decimal(bom_item.quantity) * Decimal(build.quantity)
+
+ if available < required:
+ # There is not sufficient stock for this part
+
+ lines.append({
+ 'link': InvenTree.helpers.construct_absolute_url(sub_part.get_absolute_url()),
+ 'part': sub_part,
+ 'in_stock': in_stock,
+ 'allocated': allocated,
+ 'available': available,
+ 'required': required,
+ })
+
+ if len(lines) == 0:
+ # Nothing to do
+ return
+
+ # Are there any users subscribed to these parts?
+ subscribers = build.part.get_subscribers()
+
+ emails = EmailAddress.objects.filter(
+ user__in=subscribers,
+ )
+
+ if len(emails) > 0:
+
+ logger.info(f"Notifying users of stock required for build {build.pk}")
+
+ context = {
+ 'link': InvenTree.helpers.construct_absolute_url(build.get_absolute_url()),
+ 'build': build,
+ 'part': build.part,
+ 'lines': lines,
+ }
+
+ # Render the HTML message
+ html_message = render_to_string('email/build_order_required_stock.html', context)
+
+ subject = "[InvenTree] " + _("Stock required for build order")
+
+ recipients = emails.values_list('email', flat=True)
+
+ InvenTree.tasks.send_email(subject, '', recipients, html_message=html_message)
diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index d53122cdd1..31e9f38080 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -247,7 +247,9 @@
![](${item.thumbnail || "/static/img/blank_image.png"})
${item.label}
+
+
+ `;
+
+ if (user_settings.SEARCH_SHOW_STOCK_LEVELS) {
+ html += partStockLabel(
+ item.data,
+ {
+ classes: 'badge-right',
+ }
+ );
+ }
- html += `
`;
- html += item.label;
+ html += '