Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #131 from SchrodingersGat/stock-stuff

Browse Source 
Stock stuff
This commit is contained in:
Oliver 2019-04-17 23:35:44 +10:00 committed by GitHub
commit d315b7c1d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 133 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/build/serializers.py
View File

@ -9,6 +9,7 @@ from .models import Build
class BuildSerializer(serializers.ModelSerializer):
url = serializers.CharField(source='get_absolute_url', read_only=True)
status_text = serializers.CharField(source='get_status_display', read_only=True)
class Meta:
model = Build
@ -20,4 +21,6 @@ class BuildSerializer(serializers.ModelSerializer):
'completion_date',
'part',
'quantity',
'status',
'status_text',
'notes']

69
InvenTree/part/templates/part/stock.html
View File

@ -45,50 +45,11 @@
});
});
$("#stock-table").bootstrapTable({
sortable: true,
search: true,
pagination: true,
queryParams: function(p) {
return {
part: {{ part.id }},
in_stock: true,
}
loadStockTable($("#stock-table"), {
params: {
part: {{ part.id }},
},
columns: [
{
field: 'pk',
title: 'ID',
visible: false,
},
{
checkbox: true,
},
{
field: 'location',
title: 'Location',
sortable: true,
formatter: function(value, row, index, field){
return renderLink(value.pathstring, value.url);
}
},
{
field: 'quantity',
title: 'Stock',
searchable: false,
sortable: true,
formatter: function(value, row, index, field) {
var text = renderLink(value, row.url)
text = text + "<span class='badge'>" + row.status + "</span>";
return text;
}
},
{
field: 'notes',
title: 'Notes',
},
],
url: "{% url 'api-stock-list' %}"
url: "{% url 'api-stock-list' %}",
});
function selectedStock() {
@ -109,28 +70,24 @@
return false;
});
function _stock(action) {
adjustStock({
action: action,
items: selectedStock(),
success: function() {
$('#stock-table').bootstrapTable('refresh');
}
});
}
$("#multi-item-stocktake").click(function() {
_stock('stocktake');
updateStockItems({
action: 'stocktake'
});
return false;
});
$("#multi-item-take").click(function() {
_stock('remove');
updateStockItems({
action: 'remove',
});
return false;
});
$("#multi-item-give").click(function() {
_stock('add');
updateStockItems({
action: 'add',
});
return false;
})

101
InvenTree/static/script/inventree/stock.js
View File

@ -153,6 +153,19 @@ function updateStock(items, options={}) {
});
}
function selectStockItems(options) {
/* Return list of selections from stock table
* If options.table not provided, assumed to be '#stock-table'
*/
var table_name = options.table || '#stock-table';
// Return list of selected items from the bootstrap table
return $(table_name).bootstrapTable('getSelections');
}
function adjustStock(options) {
if (options.items) {
updateStock(options.items, options);
@ -172,6 +185,32 @@ function adjustStock(options) {
}
}
function updateStockItems(options) {
/* Update one or more stock items selected from a stock-table
* Options available:
* 'action' - Action to perform - 'add' / 'remove' / 'stocktake'
* 'table' - ID of the stock table (default = '#stock-table'
*/
var table = options.table || '#stock-table';
var items = selectStockItems({
table: table,
});
// Pass items through
options.items = items;
options.table = table;
// On success, reload the table
options.success = function() {
$(table).bootstrapTable('refresh');
};
adjustStock(options);
}
function moveStockItems(items, options) {
var modal = options.modal || '#modal-form';
@ -277,4 +316,64 @@ function deleteStockItems(items, options) {
modal: modal,
title: 'Delete ' + items.length + ' stock items'
});
}
}
function loadStockTable(modal, options) {
modal.bootstrapTable({
sortable: true,
search: true,
method: 'get',
pagination: true,
rememberOrder: true,
queryParams: options.params,
columns: [
{
checkbox: true,
title: 'Select',
searchable: false,
},
{
field: 'pk',
title: 'ID',
visible: false,
},
{
field: 'part.name',
title: 'Part',
sortable: true,
formatter: function(value, row, index, field) {
return renderLink(value, row.part.url);
}
},
{
field: 'location',
title: 'Location',
sortable: true,
formatter: function(value, row, index, field) {
if (row.location) {
return renderLink(row.location.pathstring, row.location.url);
}
else {
return '';
}
}
},
{
field: 'quantity',
title: 'Quantity',
sortable: true,
formatter: function(value, row, index, field) {
var text = renderLink(value, row.url);
text = text + "<span class='badge'>" + row.status_text + "</span>";
return text;
}
},
{
field: 'notes',
title: 'Notes',
}
],
url: options.url,
});
};

2
InvenTree/stock/serializers.py
View File

@ -63,6 +63,7 @@ class StockItemSerializer(serializers.ModelSerializer):
part = PartBriefSerializer(many=False, read_only=True)
location = LocationBriefSerializer(many=False, read_only=True)
status_text = serializers.CharField(source='get_status_display', read_only=True)
class Meta:
model = StockItem
@ -78,6 +79,7 @@ class StockItemSerializer(serializers.ModelSerializer):
'serial',
'batch',
'status',
'status_text',
'notes',
]

88
InvenTree/stock/templates/stock/location.html
View File

@ -9,6 +9,7 @@
<p>{{ location.description }}</p>
{% else %}
<h3>Stock</h3>
<p>All stock items</p>
{% endif %}
</div>
<div class='col-sm-6'>
@ -135,92 +136,33 @@
return false;
});
function _stock(action) {
adjustStock({
action: action,
items: selectedStock(),
success: function() {
$('#stock-table').bootstrapTable('refresh');
}
})
}
$('#multi-item-stocktake').click(function() {
_stock('stocktake');
updateStockItems({
action: 'stocktake',
});
return false;
});
$('#multi-item-remove').click(function() {
_stock('remove');
updateStockItems({
action: 'remove',
});
return false;
});
$('#multi-item-add').click(function() {
_stock('add');
updateStockItems({
action: 'add',
});
return false;
});
$("#stock-table").bootstrapTable({
sortable: true,
search: true,
method: 'get',
pagination: true,
rememberOrder: true,
{% if location %}
queryParams: function(p) {
return {
location: {{ location.id }}
}
},
{% endif %}
columns: [
{
checkbox: true,
title: 'Select',
searchable: false,
},
{
field: 'pk',
title: 'ID',
visible: false,
},
{
field: 'part.name',
title: 'Part',
sortable: true,
formatter: function(value, row, index, field) {
return renderLink(value, row.part.url);
}
},
{% if location == None %}
{
field: 'location',
title: 'Location',
sortable: true,
formatter: function(value, row, index, field) {
if (row.location) {
return renderLink(row.location.name, row.location.url);
}
else {
return '';
}
}
},
loadStockTable($("#stock-table"), {
params: {
{% if location %}
location: {{ location.id }}
{% endif %}
{
field: 'quantity',
title: 'Stock',
sortable: true,
formatter: function(value, row, index, field) {
return renderLink(value, row.url);
}
},
{
field: 'status',
title: 'Status',
sortable: true,
}
],
},
url: "{% url 'api-stock-list' %}",
});