-
-
Notifications
You must be signed in to change notification settings - Fork 760
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fix part tables on index page - Stop table filters overriding each other * Refactor "needed for build" table - Now shows amount actually needed * Fix typo * js fix * linting * Fix warning messages on index page * js linting
- Loading branch information
1 parent
4c9d4ad
commit 09cc654
Showing
7 changed files
with
213 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| {% load i18n %} | ||
|
|
||
| /* globals | ||
| addSidebarHeader, | ||
| addSidebarItem, | ||
| checkPermission, | ||
| global_settings, | ||
| imageHoverIcon, | ||
| makeProgressBar, | ||
| renderLink, | ||
| shortenString, | ||
| user_settings, | ||
| withTitle, | ||
| */ | ||
|
|
||
| /* exported | ||
| addHeaderAction, | ||
| addHeaderTitle, | ||
| */ | ||
|
|
||
|
|
||
| /* | ||
| * Add a 'header title' to the index sidebar | ||
| */ | ||
| function addHeaderTitle(title) { | ||
| addSidebarHeader({ | ||
| text: title, | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| function addHeaderAction(label, title, icon, options) { | ||
|
|
||
| // Construct a "badge" to add to the sidebar item | ||
| var badge = ` | ||
| <span id='sidebar-badge-${label}' class='sidebar-item-badge badge rounded-pill badge-right bg-dark'> | ||
| <span class='fas fa-spin fa-spinner'></span> | ||
| </span> | ||
| `; | ||
|
|
||
| addSidebarItem({ | ||
| label: label, | ||
| text: title, | ||
| icon: icon, | ||
| content_after: badge | ||
| }); | ||
|
|
||
| // Add a detail item to the detail item-panel | ||
| $("#detail-panels").append( | ||
| `<div class='panel panel-inventree panel-hidden' id='panel-${label}'> | ||
| <div class='panel-heading'> | ||
| <h4>${title}</h4> | ||
| </div> | ||
| <div class='panel-content'> | ||
| <table class='table table-condensed table-striped' id='table-${label}'></table> | ||
| </div> | ||
| </div>` | ||
| ); | ||
|
|
||
| let table_name = `#table-${label}`; | ||
|
|
||
| // Connect a callback to the table | ||
| $(table_name).on('load-success.bs.table', function(data) { | ||
|
|
||
| let options = $(table_name).bootstrapTable('getOptions'); | ||
|
|
||
| let count = options.totalRows; | ||
|
|
||
| let badge = $(`#sidebar-badge-${label}`); | ||
|
|
||
| badge.html(count); | ||
|
|
||
| if (count > 0) { | ||
| badge.removeClass('bg-dark'); | ||
| badge.addClass('bg-primary'); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| * Load a table displaying parts which are outstanding for builds | ||
| */ | ||
| function loadRequiredForBuildsPartsTable(table, options={}) { | ||
| let name = 'parts-required-for-builds'; | ||
|
|
||
| let params = { | ||
| stock_to_build: true, | ||
| }; | ||
|
|
||
| $(table).inventreeTable({ | ||
| url: '{% url "api-part-list" %}', | ||
| queryParams: params, | ||
| name: name, | ||
| showColumns: false, | ||
| search: false, | ||
| sortable: false, | ||
| formatNoMatches: function() { | ||
| return '{% trans "No parts required for builds" %}'; | ||
| }, | ||
| columns: [ | ||
| { | ||
| field: 'name', | ||
| title: '{% trans "Part" %}', | ||
| formatter: function(value, row) { | ||
| let name = shortenString(row.full_name); | ||
| let display= imageHoverIcon(row.thumbnail) + renderLink(name, `/part/${row.pk}/`); | ||
|
|
||
| return withTitle(display, row.full_name); | ||
| } | ||
| }, | ||
| { | ||
| field: 'description', | ||
| title: '{% trans "Description" %}', | ||
| }, | ||
| { | ||
| field: 'total_in_stock', | ||
| title: '{% trans "Available" %}', | ||
| formatter: function(value, row) { | ||
| return value; | ||
| } | ||
| }, | ||
| { | ||
| field: 'allocated_to_build_orders', | ||
| title: '{% trans "Allocated Stock" %}', | ||
| formatter: function(_value, row) { | ||
| return makeProgressBar( | ||
| row.allocated_to_build_orders, | ||
| row.required_for_build_orders, | ||
| ); | ||
| } | ||
| }, | ||
| ] | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.