From 5b949b6f60bb296884063cb48b84516e0882a1a7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 27 Mar 2022 07:45:45 +1100 Subject: [PATCH 001/231] Fix sorting for location column in part table --- InvenTree/templates/js/translated/stock.js | 166 +-------------------- 1 file changed, 1 insertion(+), 165 deletions(-) diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js index b7f4162621..ade8bc5a0a 100644 --- a/InvenTree/templates/js/translated/stock.js +++ b/InvenTree/templates/js/translated/stock.js @@ -1770,6 +1770,7 @@ function loadStockTable(table, options) { col = { field: 'location_detail.pathstring', title: '{% trans "Location" %}', + sortName: 'location', formatter: function(value, row) { return locationDetail(row); } @@ -1912,172 +1913,8 @@ function loadStockTable(table, options) { original: original, showColumns: true, columns: columns, - {% if False %} - groupByField: options.groupByField || 'part', - groupBy: grouping, - groupByFormatter: function(field, id, data) { - - var row = data[0]; - - if (field == 'part_detail.full_name') { - - var html = imageHoverIcon(row.part_detail.thumbnail); - - html += row.part_detail.full_name; - html += ` (${data.length} {% trans "items" %})`; - - html += makePartIcons(row.part_detail); - - return html; - } else if (field == 'part_detail.IPN') { - var ipn = row.part_detail.IPN; - - if (ipn) { - return ipn; - } else { - return '-'; - } - } else if (field == 'part_detail.description') { - return row.part_detail.description; - } else if (field == 'packaging') { - var packaging = []; - - data.forEach(function(item) { - var pkg = item.packaging; - - if (!pkg) { - pkg = '-'; - } - - if (!packaging.includes(pkg)) { - packaging.push(pkg); - } - }); - - if (packaging.length > 1) { - return "..."; - } else if (packaging.length == 1) { - return packaging[0]; - } else { - return "-"; - } - } else if (field == 'quantity') { - var stock = 0; - var items = 0; - - data.forEach(function(item) { - stock += parseFloat(item.quantity); - items += 1; - }); - - stock = +stock.toFixed(5); - - return `${stock} (${items} {% trans "items" %})`; - } else if (field == 'status') { - var statii = []; - - data.forEach(function(item) { - var status = String(item.status); - - if (!status || status == '') { - status = '-'; - } - - if (!statii.includes(status)) { - statii.push(status); - } - }); - - // Multiple status codes - if (statii.length > 1) { - return "..."; - } else if (statii.length == 1) { - return stockStatusDisplay(statii[0]); - } else { - return "-"; - } - } else if (field == 'batch') { - var batches = []; - - data.forEach(function(item) { - var batch = item.batch; - - if (!batch || batch == '') { - batch = '-'; - } - - if (!batches.includes(batch)) { - batches.push(batch); - } - }); - - if (batches.length > 1) { - return "" + batches.length + " {% trans 'batches' %}"; - } else if (batches.length == 1) { - if (batches[0]) { - return batches[0]; - } else { - return '-'; - } - } else { - return '-'; - } - } else if (field == 'location_detail.pathstring') { - /* Determine how many locations */ - var locations = []; - - data.forEach(function(item) { - - var detail = locationDetail(item); - - if (!locations.includes(detail)) { - locations.push(detail); - } - }); - - if (locations.length == 1) { - // Single location, easy! - return locations[0]; - } else if (locations.length > 1) { - return "In " + locations.length + " {% trans 'locations' %}"; - } else { - return "{% trans 'Undefined location' %}"; - } - } else if (field == 'notes') { - var notes = []; - - data.forEach(function(item) { - var note = item.notes; - - if (!note || note == '') { - note = '-'; - } - - if (!notes.includes(note)) { - notes.push(note); - } - }); - - if (notes.length > 1) { - return '...'; - } else if (notes.length == 1) { - return notes[0] || '-'; - } else { - return '-'; - } - } else { - return ''; - } - }, - {% endif %} }); - /* - if (options.buttons) { - linkButtonsToSelection(table, options.buttons); - } - */ - var buttons = [ '#stock-print-options', '#stock-options', @@ -2092,7 +1929,6 @@ function loadStockTable(table, options) { buttons, ); - function stockAdjustment(action) { var items = $(table).bootstrapTable('getSelections'); From ce323d80ea4aadd1bbf56712450eccaae3e5e812 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 27 Mar 2022 20:29:59 +1100 Subject: [PATCH 002/231] Fix floating point issues --- InvenTree/templates/js/translated/build.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/InvenTree/templates/js/translated/build.js b/InvenTree/templates/js/translated/build.js index 46f7f32e42..fd88144f8b 100644 --- a/InvenTree/templates/js/translated/build.js +++ b/InvenTree/templates/js/translated/build.js @@ -1025,9 +1025,10 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) { } // Store the required quantity in the row data - row.required = quantity; + // Prevent weird rounding issues + row.required = parseFloat(quantity.toFixed(15)); - return quantity; + return row.required; } function sumAllocations(row) { @@ -1043,9 +1044,9 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) { quantity += item.quantity; }); - row.allocated = quantity; + row.allocated = parseFloat(quantity.toFixed(15)); - return quantity; + return row.allocated; } function setupCallbacks() { From ab7eda9d2c03cb96ac44d434c0d0bd640d40150c Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 27 Mar 2022 21:04:14 +1100 Subject: [PATCH 003/231] Add new button to navbar --- InvenTree/templates/navbar.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 126376a7dc..898171a552 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -89,9 +89,16 @@ {% endif %} {% include "search_form.html" %}
    + +
  • + +
    • + {% if barcodes %} From 441a947dbb30786b1bd5d7b97e5fe261621aa091 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 27 Mar 2022 21:06:11 +1100 Subject: [PATCH 004/231] Fix another quantity --- InvenTree/templates/js/translated/build.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/InvenTree/templates/js/translated/build.js b/InvenTree/templates/js/translated/build.js index fd88144f8b..201d3c5c9f 100644 --- a/InvenTree/templates/js/translated/build.js +++ b/InvenTree/templates/js/translated/build.js @@ -1643,6 +1643,9 @@ function allocateStockToBuild(build_id, part_id, bom_items, options={}) { remaining = 0; } + // Ensure the quantity sent to the form field is correctly formatted + remaining = parseFloat(remaining.toFixed(15)); + // We only care about entries which are not yet fully allocated if (remaining > 0) { table_entries += renderBomItemRow(bom_item, remaining); From 2976545988f8f729539b43d58937adc9fd1de54b Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 28 Mar 2022 10:02:55 +1100 Subject: [PATCH 005/231] Adds a new "offcanvas" section for search results --- .../static/script/inventree/inventree.js | 4 ++-- InvenTree/templates/navbar.html | 4 ++-- InvenTree/templates/notifications.html | 24 ++++++++++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/InvenTree/InvenTree/static/script/inventree/inventree.js b/InvenTree/InvenTree/static/script/inventree/inventree.js index d1b49aaf4b..c71231ec87 100644 --- a/InvenTree/InvenTree/static/script/inventree/inventree.js +++ b/InvenTree/InvenTree/static/script/inventree/inventree.js @@ -231,8 +231,8 @@ function inventreeDocReady() { stopNotificationWatcher(); }); - $('#offcanvasRight').on('show.bs.offcanvas', openNotificationPanel); // listener for opening the notification panel - $('#offcanvasRight').on('hidden.bs.offcanvas', closeNotificationPanel); // listener for closing the notification panel + $('#offcanvas-notification').on('show.bs.offcanvas', openNotificationPanel); // listener for opening the notification panel + $('#offcanvas-notification').on('hidden.bs.offcanvas', closeNotificationPanel); // listener for closing the notification panel } diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 898171a552..1a6e43039e 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -91,7 +91,7 @@
    • -
      • @@ -105,7 +105,7 @@ {% endif %}
    • -
      @@ -11,4 +12,21 @@
      {% trans "Show all notifications and history" %}
      - \ No newline at end of file + + + From ce396759a1a0aefafe923084647fa9d22ead6c15 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 28 Mar 2022 10:09:09 +1100 Subject: [PATCH 006/231] Add new javascript file (search.js) - Empty, for now --- InvenTree/InvenTree/urls.py | 1 + InvenTree/templates/base.html | 1 + InvenTree/templates/js/translated/search.js | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 InvenTree/templates/js/translated/search.js diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py index d795b81472..ec8b891f93 100644 --- a/InvenTree/InvenTree/urls.py +++ b/InvenTree/InvenTree/urls.py @@ -130,6 +130,7 @@ translated_javascript_urls = [ url(r'^order.js', DynamicJsView.as_view(template_name='js/translated/order.js'), name='order.js'), url(r'^part.js', DynamicJsView.as_view(template_name='js/translated/part.js'), name='part.js'), url(r'^report.js', DynamicJsView.as_view(template_name='js/translated/report.js'), name='report.js'), + url(r'^search.js', DynamicJsView.as_view(template_name='js/translated/search.js'), name='search.js'), url(r'^stock.js', DynamicJsView.as_view(template_name='js/translated/stock.js'), name='stock.js'), url(r'^plugin.js', DynamicJsView.as_view(template_name='js/translated/plugin.js'), name='plugin.js'), url(r'^tables.js', DynamicJsView.as_view(template_name='js/translated/tables.js'), name='tables.js'), diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index f916344bf9..4695984a9d 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -185,6 +185,7 @@ + diff --git a/InvenTree/templates/js/translated/search.js b/InvenTree/templates/js/translated/search.js new file mode 100644 index 0000000000..35a26963c3 --- /dev/null +++ b/InvenTree/templates/js/translated/search.js @@ -0,0 +1,8 @@ +{% load i18n %} + +/* globals +*/ + +/* exported +*/ + From ffb89af9e521dac143fadbecad4dd3c1d7ea4ad5 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 28 Mar 2022 10:10:02 +1100 Subject: [PATCH 007/231] Move search results panel into new template --- InvenTree/templates/base.html | 2 ++ InvenTree/templates/notifications.html | 16 ---------------- InvenTree/templates/search.html | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 InvenTree/templates/search.html diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index 4695984a9d..6f364ce64b 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -126,9 +126,11 @@ {% endblock %} + {% include 'modals.html' %} {% include 'about.html' %} {% include "notifications.html" %} + {% include "search.html" %} diff --git a/InvenTree/templates/notifications.html b/InvenTree/templates/notifications.html index 5da84ef7b2..e7dfc86998 100644 --- a/InvenTree/templates/notifications.html +++ b/InvenTree/templates/notifications.html @@ -14,19 +14,3 @@ - diff --git a/InvenTree/templates/search.html b/InvenTree/templates/search.html new file mode 100644 index 0000000000..be6c9ca773 --- /dev/null +++ b/InvenTree/templates/search.html @@ -0,0 +1,21 @@ +{% load i18n %} + + + \ No newline at end of file From 7d68b3209b5499fa9538e0f412bace5674a26026 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 28 Mar 2022 10:18:49 +1100 Subject: [PATCH 008/231] Add callbacks for search panel opening and closing --- .../static/script/inventree/inventree.js | 5 ++++ InvenTree/templates/js/translated/search.js | 26 +++++++++++++++++++ InvenTree/templates/search.html | 4 +-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/InvenTree/InvenTree/static/script/inventree/inventree.js b/InvenTree/InvenTree/static/script/inventree/inventree.js index c71231ec87..b7cacd5860 100644 --- a/InvenTree/InvenTree/static/script/inventree/inventree.js +++ b/InvenTree/InvenTree/static/script/inventree/inventree.js @@ -231,6 +231,11 @@ function inventreeDocReady() { stopNotificationWatcher(); }); + // Calbacks for search panel + $('#offcanvas-search').on('show.bs.offcanvas', openSearchPanel); + $('#offcanvas-search').on('hidden.bs.offcanvas', closeSearchPanel); + + // Callbacks for notifications panel $('#offcanvas-notification').on('show.bs.offcanvas', openNotificationPanel); // listener for opening the notification panel $('#offcanvas-notification').on('hidden.bs.offcanvas', closeNotificationPanel); // listener for closing the notification panel } diff --git a/InvenTree/templates/js/translated/search.js b/InvenTree/templates/js/translated/search.js index 35a26963c3..b9121a2fea 100644 --- a/InvenTree/templates/js/translated/search.js +++ b/InvenTree/templates/js/translated/search.js @@ -4,5 +4,31 @@ */ /* exported + closeSearchPanel, + openSearchPanel, */ + +function closeSearchPanel() { + + // TODO + +} + + +/* + * Callback when the search panel is opened. + * Ensure the panel is in a known state + */ +function openSearchPanel() { + + var panel = $('#offcanvas-search'); + + // Ensure the 'no results found' element is visible + panel.find('#search-no-results').show(); + + // Finally, grab keyboard focus in the search bar + panel.find('#search-input').focus(); + +} + diff --git a/InvenTree/templates/search.html b/InvenTree/templates/search.html index be6c9ca773..1780abbdee 100644 --- a/InvenTree/templates/search.html +++ b/InvenTree/templates/search.html @@ -3,7 +3,7 @@
    + {% endif %} {% include "filter_list.html" with id="location" %} @@ -222,6 +226,15 @@ ] ); + {% if labels_enabled %} + $('#print-label').click(function() { + + var locs = [{{ location.pk }}]; + + printStockLocationLabels(locs); + + }); + $('#multi-location-print-label').click(function() { var selections = $('#sublocation-table').bootstrapTable('getSelections'); @@ -234,6 +247,7 @@ printStockLocationLabels(locations); }); + {% endif %} {% if location %} $("#barcode-check-in").click(function() { @@ -298,14 +312,6 @@ adjustLocationStock('move'); }); - $('#print-label').click(function() { - - var locs = [{{ location.pk }}]; - - printStockLocationLabels(locs); - - }); - {% endif %} $('#show-qr-code').click(function() { diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index f916344bf9..3791d5f059 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -6,6 +6,7 @@ {% settings_value 'REPORT_ENABLE_TEST_REPORT' as test_report_enabled %} {% settings_value "REPORT_ENABLE" as report_enabled %} {% settings_value "SERVER_RESTART_REQUIRED" as server_restart_required %} +{% settings_value "LABEL_ENABLE" with user=user as labels_enabled %} {% inventree_demo_mode as demo_mode %} From 89d0e41ebc3a7596220e7475ea20089e4979cd3a Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 28 Mar 2022 20:59:34 +1100 Subject: [PATCH 014/231] JS lint fix --- InvenTree/templates/js/dynamic/settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/InvenTree/templates/js/dynamic/settings.js b/InvenTree/templates/js/dynamic/settings.js index 79c0d3e213..2832bd3482 100644 --- a/InvenTree/templates/js/dynamic/settings.js +++ b/InvenTree/templates/js/dynamic/settings.js @@ -4,6 +4,7 @@ editSetting, user_settings, global_settings, + plugins_enabled, */ {% user_settings request.user as USER_SETTINGS %} From f76cc89d5a10b4333ad00b856e9269d1c350792a Mon Sep 17 00:00:00 2001 From: husas Date: Mon, 28 Mar 2022 17:27:22 +0530 Subject: [PATCH 015/231] Updated setuptools version --- docker/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/requirements.txt b/docker/requirements.txt index 192d6dac6f..dced6c0a5f 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -1,7 +1,7 @@ # Base python requirements for docker containers # Basic package requirements -setuptools>=57.4.0,<=60.1.0 +setuptools==60.0.5 wheel>=0.37.0 invoke>=1.4.0 # Invoke build tool From 51d26b1d1685743fb81f5cbcc86bb6cd7d666c50 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 29 Mar 2022 20:44:12 +1100 Subject: [PATCH 016/231] Skeleton for displaying search results --- InvenTree/templates/js/translated/search.js | 74 ++++++++++++++++++--- InvenTree/templates/search.html | 3 + 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/InvenTree/templates/js/translated/search.js b/InvenTree/templates/js/translated/search.js index 5b36f26213..26ba8ed5dd 100644 --- a/InvenTree/templates/js/translated/search.js +++ b/InvenTree/templates/js/translated/search.js @@ -25,8 +25,7 @@ function openSearchPanel() { var panel = $('#offcanvas-search'); - // Ensure the 'no results found' element is visible - panel.find('#search-no-results').show(); + clearSearchResults(); // Finally, grab keyboard focus in the search bar panel.find('#search-input').focus(); @@ -39,6 +38,7 @@ var searchRequests = []; var searchInputTimer = null; var searchText = null; var searchTextPrevious = null; +var searchQueries = []; function searchTextChanged(event) { @@ -55,14 +55,23 @@ function updateSearch() { return; } + clearSearchResults(); + if (searchText.length == 0) { return; } - + searchTextPrevious = searchText; + // Cancel any previous AJAX requests + searchQueries.forEach(function(query) { + query.abort(); + }); + + searchQueries = []; + // Search for matching parts - inventreeGet( + searchQueries.push(inventreeGet( `{% url "api-part-list" %}`, { search: searchText, @@ -70,14 +79,14 @@ function updateSearch() { offset: 0, }, { - success: function(results) { - // TODO + success: function(response) { + addSearchResults('part', response.results, '{% trans "Parts" %}'); } } - ); + )); // Search for matching stock items - inventreeGet( + searchQueries.push(inventreeGet( '{% url "api-stock-list" %}', { search: searchText, @@ -85,10 +94,53 @@ function updateSearch() { offset: 0, }, { - success: function(results) { - // TODO + success: function(response) { + addSearchResults('stock', response.results, '{% trans "Stock Items" %}'); } } - ) + )); +} + +function clearSearchResults() { + + var panel = $('#offcanvas-search'); + + // Ensure the 'no results found' element is visible + panel.find('#search-no-results').show(); + + // Delete any existing search results + panel.find('#search-results').empty(); +} + + +// Add a group of results to the list +function addSearchResults(key, results, title, formatter) { + + if (results.length == 0) { + // Do not display this group, as there are no results + return; + } + + var panel = $('#offcanvas-search'); + + // Ensure the 'no results found' element is hidden + panel.find('#search-no-results').hide(); + + var results_element = panel.find('#search-results'); + + var header = `search-results-${key}`; + + panel.find('#search-results').append(` +
    +
    ${title}
    +
    + `); + + results.forEach(function(result) { + // results_html.append(formatter(result)); + var result_html = `
    hello result
    `; + + panel.find(`#${header}`).append(result_html); + }); } \ No newline at end of file diff --git a/InvenTree/templates/search.html b/InvenTree/templates/search.html index 1780abbdee..d66df22961 100644 --- a/InvenTree/templates/search.html +++ b/InvenTree/templates/search.html @@ -15,6 +15,9 @@

    {% trans "No search results" %}

    +
    + +
    From 78e5a685dc91e60c9bb50c19b3040e28655a5a35 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Tue, 29 Mar 2022 22:35:47 +1100 Subject: [PATCH 017/231] Display results for parts and stock items - Use the existing rendering functions --- InvenTree/InvenTree/static/css/inventree.css | 26 +++++++ .../js/translated/model_renderers.js | 36 ++++----- InvenTree/templates/js/translated/search.js | 75 +++++++++++++++---- InvenTree/templates/search.html | 15 +++- 4 files changed, 118 insertions(+), 34 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 3f6fffe19b..78f3f4addc 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -1018,4 +1018,30 @@ input[type='number']{ a { text-decoration: none; background-color: transparent; +} + +/* Quicksearch Panel */ + +.search-result-panel { + max-width: 800px; + width: 50% +} + +.search-result-group { + padding: 5px; + border: 1px solid var(--border-color); + margin-bottom: 10px; +} + +.search-result-group-buttons > button{ + padding: 2px; + padding-left: 5px; + padding-right: 5px; + font-size: 80%; +} + +.search-result-entry { + border-top: 1px solid var(--border-color); + padding: 3px; + margin-top: 3px; } \ No newline at end of file diff --git a/InvenTree/templates/js/translated/model_renderers.js b/InvenTree/templates/js/translated/model_renderers.js index e3abe1186f..5f81cb9abf 100644 --- a/InvenTree/templates/js/translated/model_renderers.js +++ b/InvenTree/templates/js/translated/model_renderers.js @@ -31,7 +31,7 @@ // Renderer for "Company" model // eslint-disable-next-line no-unused-vars -function renderCompany(name, data, parameters, options) { +function renderCompany(name, data, parameters={}, options={}) { var html = select2Thumbnail(data.image); @@ -45,7 +45,7 @@ function renderCompany(name, data, parameters, options) { // Renderer for "StockItem" model // eslint-disable-next-line no-unused-vars -function renderStockItem(name, data, parameters, options) { +function renderStockItem(name, data, parameters={}, options={}) { var image = blankImage(); @@ -111,7 +111,7 @@ function renderStockItem(name, data, parameters, options) { // Renderer for "StockLocation" model // eslint-disable-next-line no-unused-vars -function renderStockLocation(name, data, parameters, options) { +function renderStockLocation(name, data, parameters={}, options={}) { var level = '- '.repeat(data.level); @@ -133,7 +133,7 @@ function renderStockLocation(name, data, parameters, options) { } // eslint-disable-next-line no-unused-vars -function renderBuild(name, data, parameters, options) { +function renderBuild(name, data, parameters={}, options={}) { var image = null; @@ -154,7 +154,7 @@ function renderBuild(name, data, parameters, options) { // Renderer for "Part" model // eslint-disable-next-line no-unused-vars -function renderPart(name, data, parameters, options) { +function renderPart(name, data, parameters={}, options={}) { var html = select2Thumbnail(data.image); @@ -164,13 +164,14 @@ function renderPart(name, data, parameters, options) { html += ` - ${data.description}`; } - var extra = ''; + var stock_data = ''; - // Display available part quantity if (user_settings.PART_SHOW_QUANTITY_IN_FORMS) { - extra += partStockLabel(data); + stock_data = partStockLabel(data); } + var extra = ''; + if (!data.active) { extra += `{% trans "Inactive" %}`; } @@ -178,6 +179,7 @@ function renderPart(name, data, parameters, options) { html += ` + ${stock_data} ${extra} {% trans "Part ID" %}: ${data.pk} @@ -188,7 +190,7 @@ function renderPart(name, data, parameters, options) { // Renderer for "User" model // eslint-disable-next-line no-unused-vars -function renderUser(name, data, parameters, options) { +function renderUser(name, data, parameters={}, options={}) { var html = `${data.username}`; @@ -202,7 +204,7 @@ function renderUser(name, data, parameters, options) { // Renderer for "Owner" model // eslint-disable-next-line no-unused-vars -function renderOwner(name, data, parameters, options) { +function renderOwner(name, data, parameters={}, options={}) { var html = `${data.name}`; @@ -223,7 +225,7 @@ function renderOwner(name, data, parameters, options) { // Renderer for "PurchaseOrder" model // eslint-disable-next-line no-unused-vars -function renderPurchaseOrder(name, data, parameters, options) { +function renderPurchaseOrder(name, data, parameters={}, options={}) { var html = ''; var prefix = global_settings.PURCHASEORDER_REFERENCE_PREFIX; @@ -257,7 +259,7 @@ function renderPurchaseOrder(name, data, parameters, options) { // Renderer for "SalesOrder" model // eslint-disable-next-line no-unused-vars -function renderSalesOrder(name, data, parameters, options) { +function renderSalesOrder(name, data, parameters={}, options={}) { var html = `${data.reference}`; if (data.description) { @@ -277,7 +279,7 @@ function renderSalesOrder(name, data, parameters, options) { // Renderer for "SalesOrderShipment" model // eslint-disable-next-line no-unused-vars -function renderSalesOrderShipment(name, data, parameters, options) { +function renderSalesOrderShipment(name, data, parameters={}, options={}) { var so_prefix = global_settings.SALESORDER_REFERENCE_PREFIX; @@ -294,7 +296,7 @@ function renderSalesOrderShipment(name, data, parameters, options) { // Renderer for "PartCategory" model // eslint-disable-next-line no-unused-vars -function renderPartCategory(name, data, parameters, options) { +function renderPartCategory(name, data, parameters={}, options={}) { var level = '- '.repeat(data.level); @@ -310,7 +312,7 @@ function renderPartCategory(name, data, parameters, options) { } // eslint-disable-next-line no-unused-vars -function renderPartParameterTemplate(name, data, parameters, options) { +function renderPartParameterTemplate(name, data, parameters={}, options={}) { var units = ''; @@ -326,7 +328,7 @@ function renderPartParameterTemplate(name, data, parameters, options) { // Renderer for "ManufacturerPart" model // eslint-disable-next-line no-unused-vars -function renderManufacturerPart(name, data, parameters, options) { +function renderManufacturerPart(name, data, parameters={}, options={}) { var manufacturer_image = null; var part_image = null; @@ -355,7 +357,7 @@ function renderManufacturerPart(name, data, parameters, options) { // Renderer for "SupplierPart" model // eslint-disable-next-line no-unused-vars -function renderSupplierPart(name, data, parameters, options) { +function renderSupplierPart(name, data, parameters={}, options={}) { var supplier_image = null; var part_image = null; diff --git a/InvenTree/templates/js/translated/search.js b/InvenTree/templates/js/translated/search.js index 26ba8ed5dd..a3e4ea59de 100644 --- a/InvenTree/templates/js/translated/search.js +++ b/InvenTree/templates/js/translated/search.js @@ -32,6 +32,11 @@ function openSearchPanel() { panel.find('#search-input').on('keyup change', searchTextChanged); + // Callback for "clear search" button + panel.find('#search-clear').click(function() { + panel.find('#search-input').val(''); + clearSearchResults(); + }); } var searchRequests = []; @@ -80,7 +85,15 @@ function updateSearch() { }, { success: function(response) { - addSearchResults('part', response.results, '{% trans "Parts" %}'); + addSearchResults( + 'part', + response.results, + '{% trans "Parts" %}', + renderPart, + { + show_stock_data: false, + } + ); } } )); @@ -92,10 +105,19 @@ function updateSearch() { search: searchText, limit: 10, offset: 0, + part_detail: true, + location_detail: true, }, { success: function(response) { - addSearchResults('stock', response.results, '{% trans "Stock Items" %}'); + addSearchResults( + 'stock', + response.results, + '{% trans "Stock Items" %}', + renderStockItem, + { + } + ); } } )); @@ -115,7 +137,7 @@ function clearSearchResults() { // Add a group of results to the list -function addSearchResults(key, results, title, formatter) { +function addSearchResults(key, results, title, renderFunc, renderParams={}) { if (results.length == 0) { // Do not display this group, as there are no results @@ -126,21 +148,48 @@ function addSearchResults(key, results, title, formatter) { // Ensure the 'no results found' element is hidden panel.find('#search-no-results').hide(); - - var results_element = panel.find('#search-results'); - - var header = `search-results-${key}`; panel.find('#search-results').append(` -
    -
    ${title}
    +
    +
    +
    ${title}
    + +
    + + +
    +
    +
    +
    `); results.forEach(function(result) { - // results_html.append(formatter(result)); - var result_html = `
    hello result
    `; + var html = renderFunc(key, result, renderParams); - panel.find(`#${header}`).append(result_html); + var result_html = ` +
    + ${html} +
    + `; + + panel.find(`#search-result-list-${key}`).append(result_html); }); -} \ No newline at end of file + + // Expand results panel + panel.find(`#search-result-list-${key}`).toggle(); + + // Add callback for "toggle" button + panel.find(`#hide-results-${key}`).click(function() { + panel.find(`#search-result-list-${key}`).toggle(); + }); + + // Add callback for "remove" button + panel.find(`#remove-results-${key}`).click(function() { + panel.find(`#search-results-${key}`).remove(); + }); +} diff --git a/InvenTree/templates/search.html b/InvenTree/templates/search.html index d66df22961..4a3921b4a7 100644 --- a/InvenTree/templates/search.html +++ b/InvenTree/templates/search.html @@ -1,14 +1,21 @@ {% load i18n %} -
From f2d053719885f8a6bc3ea0220aedb3e4013f067f Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 24 Apr 2022 15:12:03 +0200 Subject: [PATCH 173/231] set navbar message via config file --- InvenTree/config_template.yaml | 2 ++ InvenTree/templates/navbar.html | 9 +++++++-- InvenTree/templates/navbar_demo.html | 12 ------------ 3 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 InvenTree/templates/navbar_demo.html diff --git a/InvenTree/config_template.yaml b/InvenTree/config_template.yaml index 862d062787..1067910629 100644 --- a/InvenTree/config_template.yaml +++ b/InvenTree/config_template.yaml @@ -189,3 +189,5 @@ static_root: '/home/inventree/data/static' # customize: # login_message: | # InvenTree demo instance - Click here for login details +# navbar_message: | +# InvenTree demo mode diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 3af7fe481f..f873d6f84c 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -8,6 +8,7 @@ {% navigation_enabled as plugin_nav %} {% inventree_demo_mode as demo %} {% inventree_show_about user as show_about %} +{% inventree_customize 'navbar_message' as navbar_message %}