-
-
-{% endblock %}
-
-{% block js_ready %}
-
-{{ block.super }}
-
-loadInstalledInTable(
- $('#installed-table'),
- {
- stock_item: {{ item.pk }},
- part: {{ item.part.pk }},
- quantity: {{ item.quantity }},
- }
-);
-
-$('#multi-item-uninstall').click(function() {
-
- var selections = $('#installed-table').bootstrapTable('getSelections');
-
- var items = [];
-
- selections.forEach(function(item) {
- items.push(item.pk);
- });
-
- launchModalForm(
- "{% url 'stock-item-uninstall' %}",
- {
- data: {
- 'items[]': items,
- },
- reload: true,
- }
- );
-});
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/item_notes.html b/InvenTree/stock/templates/stock/item_notes.html
deleted file mode 100644
index 788f7fb3bd..0000000000
--- a/InvenTree/stock/templates/stock/item_notes.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends "stock/item_base.html" %}
-
-{% load static %}
-{% load inventree_extras %}
-{% load i18n %}
-{% load markdownify %}
-
-{% block menubar %}
-{% include "stock/navbar.html" with tab="notes" %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Stock Item Notes" %}
-{% if roles.stock.change and not editing %}
-
-{% endif %}
-{% endblock %}
-
-{% block details %}
-{% if editing %}
-
-
-{{ form.media }}
-
-{% else %}
-{% if item.notes %}
-{{ item.notes | markdownify }}
-{% endif %}
-
-{% endif %}
-
-{% endblock %}
-
-{% block js_ready %}
-
-{{ block.super }}
-
-{% if editing %}
-{% else %}
-$("#edit-notes").click(function() {
- location.href = "{% url 'stock-item-notes' item.id %}?edit=1";
-});
-{% endif %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/item_tests.html b/InvenTree/stock/templates/stock/item_tests.html
deleted file mode 100644
index d7d26fcbba..0000000000
--- a/InvenTree/stock/templates/stock/item_tests.html
+++ /dev/null
@@ -1,150 +0,0 @@
-{% extends "stock/item_base.html" %}
-
-{% load static %}
-{% load i18n %}
-
-{% block menubar %}
-{% include "stock/navbar.html" with tab='tests' %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Test Data" %}
-{% endblock %}
-
-{% block details %}
-
-
-
-
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
-loadStockTestResultsTable(
- $("#test-result-table"), {
- part: {{ item.part.id }},
- stock_item: {{ item.id }},
- }
-);
-
-function reloadTable() {
- $("#test-result-table").bootstrapTable("refresh");
-}
-
-{% if item.has_test_reports %}
-$("#test-report").click(function() {
- printTestReports([{{ item.pk }}]);
-});
-{% endif %}
-
-{% if user.is_staff %}
-$("#delete-test-results").click(function() {
- launchModalForm(
- "{% url 'stock-item-delete-test-data' item.id %}",
- {
- success: reloadTable,
- }
- );
-});
-{% endif %}
-
-$("#add-test-result").click(function() {
-
- constructForm('{% url "api-stock-test-result-list" %}', {
- method: 'POST',
- fields: {
- test: {},
- result: {},
- value: {},
- attachment: {},
- notes: {},
- stock_item: {
- value: {{ item.pk }},
- hidden: true,
- }
- },
- title: '{% trans "Add Test Result" %}',
- onSuccess: reloadTable,
- });
-});
-
-$("#test-result-table").on('click', '.button-test-add', function() {
- var button = $(this);
-
- var test_name = button.attr('pk');
-
- constructForm('{% url "api-stock-test-result-list" %}', {
- method: 'POST',
- fields: {
- test: {
- value: test_name,
- },
- result: {},
- value: {},
- attachment: {},
- notes: {},
- stock_item: {
- value: {{ item.pk }},
- hidden: true,
- }
- },
- title: '{% trans "Add Test Result" %}',
- onSuccess: reloadTable,
- });
-});
-
-$("#test-result-table").on('click', '.button-test-edit', function() {
- var button = $(this);
-
- var pk = button.attr('pk');
-
- var url = `/api/stock/test/${pk}/`;
-
- constructForm(url, {
- fields: {
- test: {},
- result: {},
- value: {},
- attachment: {},
- notes: {},
- },
- title: '{% trans "Edit Test Result" %}',
- onSuccess: reloadTable,
- });
-});
-
-$("#test-result-table").on('click', '.button-test-delete', function() {
- var button = $(this);
-
- var pk = button.attr('pk');
-
- var url = `/api/stock/test/${pk}/`;
-
- constructForm(url, {
- method: 'DELETE',
- title: '{% trans "Delete Test Result" %}',
- onSuccess: reloadTable,
- });
-});
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index d70d9a44be..229ad9cfd1 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -4,7 +4,7 @@
{% load i18n %}
{% block menubar %}
-{% include "stock/location_navbar.html" with tab="stock" %}
+{% include "stock/location_navbar.html" %}
{% endblock %}
{% block content %}
@@ -143,13 +143,39 @@
{% block location_content %}
-
- {% if location %}
-
- {% else %}
-
- {% endif %}
+
+
{% trans "Sublocations" %}
- {% if location %}
-
- {% else %}
-
- {% endif %}
+
{% trans "Stock Items" %}
diff --git a/InvenTree/stock/templates/stock/navbar.html b/InvenTree/stock/templates/stock/navbar.html
index 7c7d197a1a..90c0075ba0 100644
--- a/InvenTree/stock/templates/stock/navbar.html
+++ b/InvenTree/stock/templates/stock/navbar.html
@@ -8,24 +8,24 @@
-
-
+
+
{% trans "History" %}
{% if item.part.trackable %}
-
-
+
+
{% trans "Test Data" %}
{% if item.part.assembly %}
-
-
+
+
{% trans "Installed Items" %}
@@ -35,8 +35,8 @@
{% endif %}
{% if item.child_count > 0 %}
-
-
+
+
{% trans "Children" %}
@@ -44,15 +44,15 @@
{% endif %}
-
-
+
+
{% trans "Attachments" %}
-
-
+
+
{% trans "Notes" %}
diff --git a/InvenTree/stock/templates/stock/sublocation.html b/InvenTree/stock/templates/stock/sublocation.html
deleted file mode 100644
index be9390df3b..0000000000
--- a/InvenTree/stock/templates/stock/sublocation.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{% extends "stock/location.html" %}
-
-{% load static %}
-{% load i18n %}
-{% load inventree_extras %}
-
-{% block menubar %}
-{% include "stock/location_navbar.html" with tab="sublocations" %}
-{% endblock %}
-
-
-{% block location_content %}
-
-",
+* and point to a matching "panel-"
+*/
+function attachNavCallbacks(options={}) {
+
+ $('.nav-toggle').click(function() {
+ var el = $(this);
+
+ // Find the matching "panel" element
+ var panelName = el.attr('id').replace('select-', '');
+
+ activatePanel(panelName, options);
+ });
+
+ var panelClass = options.name || 'unknown';
+
+ /* Look for a default panel to initialize
+ * First preference = URL parameter e.g. ?display=part-stock
+ * Second preference = localStorage
+ * Third preference = default
+ */
+ var defaultPanel = $.urlParam('display') || localStorage.getItem(`inventree-selected-panel-${panelClass}`) || options.default;
+
+ if (defaultPanel) {
+ activatePanel(defaultPanel);
+ }
+}
+
+
+function activatePanel(panelName, options={}) {
+
+ var panelClass = options.name || 'unknown';
+
+ // First, cause any other panels to "fade out"
+ $('.panel-visible').hide();
+ $('.panel-visible').removeClass('panel-visible');
+
+ // Find the target panel
+ var panel = `#panel-${panelName}`;
+ var select = `#select-${panelName}`;
+
+ // Check that the selected panel (and select) exist
+ if ($(panel).length && $(select).length) {
+ // Yep, both are displayed
+ } else {
+ // Either the select or the panel are not displayed!
+ // Iterate through the available 'select' elements until one matches
+ panelName = null;
+
+ $('.nav-toggle').each(function(item) {
+ var panel_name = $(this).attr('id').replace('select-', '');
+
+ if ($(`#panel-${panel_name}`).length && (panelName == null)) {
+ panelName = panel_name;
+ }
+
+ panel = `#panel-${panelName}`;
+ select = `#select-${panelName}`;
+ });
+ }
+
+ // Save the selected panel
+ localStorage.setItem(`inventree-selected-panel-${panelClass}`, panelName);
+
+ // Display the panel
+ $(panel).addClass('panel-visible');
+ $(panel).fadeIn(100);
+
+ // Un-select all selectors
+ $('.list-group-item').removeClass('active');
+
+ // Find the associated selector
+ var select = `#select-${panelName}`;
+
+ $(select).parent('.list-group-item').addClass('active');
+}
\ No newline at end of file
diff --git a/InvenTree/templates/js/part.js b/InvenTree/templates/js/part.js
index e106098ad4..169c722d79 100644
--- a/InvenTree/templates/js/part.js
+++ b/InvenTree/templates/js/part.js
@@ -13,6 +13,94 @@ function yesNoLabel(value) {
}
}
+
+function editPart(pk, options={}) {
+
+ var url = `/api/part/${pk}/`;
+
+ var fields = {
+ category: {
+ /*
+ secondary: {
+ label: '{% trans "New Category" %}',
+ title: '{% trans "Create New Part Category" %}',
+ api_url: '{% url "api-part-category-list" %}',
+ method: 'POST',
+ fields: {
+ name: {},
+ description: {},
+ parent: {
+ secondary: {
+ title: '{% trans "New Parent" %}',
+ api_url: '{% url "api-part-category-list" %}',
+ method: 'POST',
+ fields: {
+ name: {},
+ description: {},
+ parent: {},
+ }
+ }
+ },
+ }
+ },
+ */
+ },
+ name: {
+ placeholder: 'part name',
+ },
+ IPN: {},
+ description: {},
+ revision: {},
+ keywords: {
+ icon: 'fa-key',
+ },
+ variant_of: {},
+ link: {
+ icon: 'fa-link',
+ },
+ default_location: {
+ /*
+ secondary: {
+ label: '{% trans "New Location" %}',
+ title: '{% trans "Create new stock location" %}',
+ },
+ */
+ },
+ default_supplier: {
+ filters: {
+ part: pk,
+ part_detail: true,
+ manufacturer_detail: true,
+ supplier_detail: true,
+ },
+ /*
+ secondary: {
+ label: '{% trans "New Supplier Part" %}',
+ title: '{% trans "Create new supplier part" %}',
+ }
+ */
+ },
+ units: {},
+ minimum_stock: {},
+ virtual: {},
+ is_template: {},
+ assembly: {},
+ component: {},
+ trackable: {},
+ purchaseable: {},
+ salable: {},
+ active: {},
+ };
+
+ constructForm(url, {
+ fields: fields,
+ title: '{% trans "Edit Part" %}',
+ reload: true,
+ });
+
+}
+
+
function toggleStar(options) {
/* Toggle the 'starred' status of a part.
* Performs AJAX queries and updates the display on the button.
@@ -626,7 +714,7 @@ function loadPartTable(table, url, options={}) {
var html = '';
- html = `
- {% trans "This stock item does not have any child items" %}
-
-{% endif %}
-
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
-{% if item.child_count > 0 %}
-loadStockTable($("#stock-table"), {
- params: {
- location_detail: true,
- part_detail: false,
- ancestor: {{ item.id }},
- },
- name: 'item-childs',
- groupByField: 'location',
- buttons: [
- '#stock-options',
- ],
- url: "{% url 'api-stock-list' %}",
-});
-{% endif %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/templates/stock/item_installed.html b/InvenTree/stock/templates/stock/item_installed.html
deleted file mode 100644
index 8902fe00ef..0000000000
--- a/InvenTree/stock/templates/stock/item_installed.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends "stock/item_base.html" %}
-
-{% load static %}
-{% load i18n %}
-
-{% block menubar %}
-{% include "stock/navbar.html" with tab='installed' %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Installed Stock Items" %}
-{% endblock %}
-
-{% block details %}
-
+
{% include "stock_table.html" %}
+
@@ -164,6 +190,36 @@
toggleId: '#location-menu-toggle'
});
+ loadStockLocationTable($('#sublocation-table'), {
+ params: {
+ {% if location %}
+ parent: {{ location.pk }},
+ {% else %}
+ parent: 'null',
+ {% endif %}
+ }
+ });
+
+ linkButtonsToSelection(
+ $('#sublocation-table'),
+ [
+ '#location-print-options',
+ ]
+ );
+
+ $('#multi-location-print-label').click(function() {
+
+ var selections = $('#sublocation-table').bootstrapTable('getSelections');
+
+ var locations = [];
+
+ selections.forEach(function(loc) {
+ locations.push(loc.pk);
+ });
+
+ printStockLocationLabels(locations);
+ });
+
{% if location %}
$("#barcode-check-in").click(function() {
barcodeCheckIn({{ location.id }});
@@ -301,4 +357,10 @@
},
url: "{% url 'api-stock-list' %}",
});
+
+ attachNavCallbacks({
+ name: 'stocklocation',
+ default: 'stock'
+ });
+
{% endblock %}
diff --git a/InvenTree/stock/templates/stock/location_navbar.html b/InvenTree/stock/templates/stock/location_navbar.html
index a4974d0d37..d03761e460 100644
--- a/InvenTree/stock/templates/stock/location_navbar.html
+++ b/InvenTree/stock/templates/stock/location_navbar.html
@@ -8,23 +8,15 @@
- {% trans "Stock Items" %}
+
+
{% endblock %}
+
+ {% trans "Sublocations" %}
+
+
+
+
+
+
-
-
-
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
-loadStockLocationTable($('#sublocation-table'), {
- params: {
- {% if location %}
- parent: {{ location.pk }},
- {% else %}
- parent: 'null',
- {% endif %}
- }
-});
-
-linkButtonsToSelection(
- $('#sublocation-table'),
- [
- '#location-print-options',
- ]
-);
-
-$('#multi-location-print-label').click(function() {
-
- var selections = $('#sublocation-table').bootstrapTable('getSelections');
-
- var locations = [];
-
- selections.forEach(function(loc) {
- locations.push(loc.pk);
- });
-
- printStockLocationLabels(locations);
-})
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/stock/urls.py b/InvenTree/stock/urls.py
index 67101c1f3b..bcf180b700 100644
--- a/InvenTree/stock/urls.py
+++ b/InvenTree/stock/urls.py
@@ -14,9 +14,7 @@ location_urls = [
url(r'^edit/?', views.StockLocationEdit.as_view(), name='stock-location-edit'),
url(r'^delete/?', views.StockLocationDelete.as_view(), name='stock-location-delete'),
url(r'^qr_code/?', views.StockLocationQRCode.as_view(), name='stock-location-qr'),
-
- url(r'sublocation/', views.StockLocationDetail.as_view(template_name='stock/sublocation.html'), name='stock-location-sublocation'),
-
+
# Anything else
url('^.*$', views.StockLocationDetail.as_view(), name='stock-location-detail'),
])),
@@ -36,12 +34,6 @@ stock_item_detail_urls = [
url(r'^add_tracking/', views.StockItemTrackingCreate.as_view(), name='stock-tracking-create'),
- url(r'^test/', views.StockItemDetail.as_view(template_name='stock/item_tests.html'), name='stock-item-test-results'),
- url(r'^children/', views.StockItemDetail.as_view(template_name='stock/item_childs.html'), name='stock-item-children'),
- url(r'^attachments/', views.StockItemDetail.as_view(template_name='stock/item_attachments.html'), name='stock-item-attachments'),
- url(r'^installed/', views.StockItemDetail.as_view(template_name='stock/item_installed.html'), name='stock-item-installed'),
- url(r'^notes/', views.StockItemNotes.as_view(), name='stock-item-notes'),
-
url('^.*$', views.StockItemDetail.as_view(), name='stock-item-detail'),
]
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 4818fda1c6..9d4eaa5142 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -149,22 +149,23 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
-
-
diff --git a/InvenTree/templates/js/api.js b/InvenTree/templates/js/api.js
index 93fa5a41e4..8169671836 100644
--- a/InvenTree/templates/js/api.js
+++ b/InvenTree/templates/js/api.js
@@ -3,6 +3,14 @@
var jQuery = window.$;
+$.urlParam = function(name){
+ var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+ if (results==null) {
+ return null;
+ }
+ return decodeURI(results[1]) || 0;
+}
+
// using jQuery
function getCookie(name) {
var cookieValue = null;
diff --git a/InvenTree/templates/js/build.js b/InvenTree/templates/js/build.js
index e284a0e8c8..f43de6ec2b 100644
--- a/InvenTree/templates/js/build.js
+++ b/InvenTree/templates/js/build.js
@@ -921,7 +921,7 @@ function loadBuildTable(table, options) {
}
else
{
- return '{% trans "No user information" %}';
+ return `{% trans "No user information" %}`;
}
}
},
diff --git a/InvenTree/templates/js/nav.js b/InvenTree/templates/js/nav.js
new file mode 100644
index 0000000000..aff3435b21
--- /dev/null
+++ b/InvenTree/templates/js/nav.js
@@ -0,0 +1,84 @@
+
+/*
+* Attach callbacks to navigation bar elements.
+*
+* Searches for elements with the class 'nav-toggle'.
+* A callback is added to each element,
+* to display the matching panel.
+*
+* The 'id' of the .nav-toggle element should be of the form "select-
-
-
-
-
- {% trans "Sublocations" %}
-`;
+ html = `
`;
data.forEach(function(row, index) {
diff --git a/InvenTree/templates/js/stock.js b/InvenTree/templates/js/stock.js
index f173f868f7..754d3d5b59 100644
--- a/InvenTree/templates/js/stock.js
+++ b/InvenTree/templates/js/stock.js
@@ -1495,7 +1495,7 @@ function loadStockTrackingTable(table, options) {
}
else
{
- return '{% trans "No user information" %}';
+ return `{% trans "No user information" %}`;
}
}
});
diff --git a/InvenTree/templates/stock_table.html b/InvenTree/templates/stock_table.html
index d917bac72a..583f4db893 100644
--- a/InvenTree/templates/stock_table.html
+++ b/InvenTree/templates/stock_table.html
@@ -8,7 +8,7 @@
{% authorized_owners location.owner as owners %}
{% endif %}
-