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 remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2019-05-02 21:33:51 +10:00
commit 3f8f7ed32c
4 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/build/models.py
View File

@ -133,6 +133,9 @@ class Build(models.Model):
for item in self.allocated_stock.all():
item.delete()
# Date of 'completion' is the date the build was cancelled
self.completion_date = datetime.now().date()
self.status = self.CANCELLED
self.save()

19
InvenTree/build/templates/build/build_list.html
View File

@ -1,4 +1,20 @@
{% extends "collapse.html" %}
{% block collapse_title %}
<b>{{ title }}</b> - {{ builds | length }}
{% endblock %}
{% block collapse_content %}
<table class='table table-striped table-condensed build-table' id='build-table-{{collapse_id}}' data-toolbar='#button-toolbar'>
<thead>
<tr>
<th>Build</th>
<th>Part</th>
<th>Quantity</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% for build in builds %}
<tr>
<td><a href="{% url 'build-detail' build.id %}">{{ build.title }}</a></td>
@ -7,3 +23,6 @@
<td>{% include "build_status.html" with build=build %}
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}

35
InvenTree/build/templates/build/index.html
View File

@ -2,28 +2,40 @@
{% load static %}
{% block content %}
<h3>Part Builds</h3>
<div id='button-toolbar'>
<h4>Active Builds</h4>
<div id='active-build-toolbar'>
<div class='btn-group'>
<button class="btn btn-success" id='new-build'>Start New Build</button>
</div>
</div>
<table class='table table-striped table-condensed' id='build-table' data-toolbar='#button-toolbar'>
<thead>
<tr>
<table class='table table-striped table-condensed build-table' id='build-table-{{collapse_id}}' data-toolbar='#active-build-toolbar'>
<thead>
<tr>
<th>Build</th>
<th>Part</th>
<th>Quantity</th>
<th>Status</th>
</tr>
</thead>
<tbody>
{% for build in active %}
<tr>
<td><a href="{% url 'build-detail' build.id %}">{{ build.title }}</a></td>
<td><a href="{% url 'part-build' build.part.id %}">{{ build.part.name }}</a></td>
<td>{{ build.quantity }}</td>
<td>{% include "build_status.html" with build=build %}
</tr>
</thead>
<tbody>
{% include "build/build_list.html" with builds=builds %}
{% endfor %}
</tbody>
</table>
<p></p>
{% include "build/build_list.html" with builds=completed title="Completed Builds" collapse_id="complete" %}
<p></p>
{% include "build/build_list.html" with builds=cancelled title="Cancelled Builds" collapse_id="cancelled" %}
{% include 'modals.html' %}
@ -39,9 +51,10 @@
});
});
$("#build-table").bootstrapTable({
$(".build-table").bootstrapTable({
sortable: true,
search: true,
formatNoMatches: function() { return 'No builds found'; },
columns: [
{
field: 'name',

6
InvenTree/build/views.py
View File

@ -33,12 +33,10 @@ class BuildIndex(ListView):
context = super(BuildIndex, self).get_context_data(**kwargs).copy()
"""
context['active'] = self.get_queryset().filter(status__in=[Build.PENDING, Build.HOLDING])
context['active'] = self.get_queryset().filter(status__in=[Build.PENDING, ])
context['complete'] = self.get_queryset().filter(status=Build.COMPLETE)
context['completed'] = self.get_queryset().filter(status=Build.COMPLETE)
context['cancelled'] = self.get_queryset().filter(status=Build.CANCELLED)
"""
return context