visual consolidation

This commit is contained in:
Oliver Walters 2020-04-06 20:50:33 +10:00
parent e6f6a936e0
commit 44c10c45cd
11 changed files with 37 additions and 17 deletions

View File

@ -10,6 +10,7 @@
<hr>
<table class='table table-striped'>
<col width='25'>
<tr>
<td></td>
<td>{% trans "Title" %}</td>

View File

@ -43,6 +43,7 @@ InvenTree | {% trans "Company" %} - {{ company.name }}
</div>
<div class="col-sm-6">
<table class="table">
<col width='25'>
{% if company.website %}
<tr>
<td><span class='fas fa-link'></span></td>

View File

@ -9,14 +9,18 @@
<hr>
<table class='table table-striped'>
<tr>
<td>{% trans "Customer" %}</td>
<td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
</tr>
<tr>
<td>{% trans "Supplier" %}</td>
<td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
</tr>
<col width='25'>
<col>
<tr>
<td><span class='fas fa-user-tag'></span></td>
<td>{% trans "Customer" %}</td>
<td>{% include 'yesnolabel.html' with value=company.is_customer %}</td>
</tr>
<tr>
<td><span class='fas fa-industry'></span></td>
<td>{% trans "Supplier" %}</td>
<td>{% include 'yesnolabel.html' with value=company.is_supplier %}</td>
</tr>
</table>
{% endblock %}

View File

@ -60,6 +60,7 @@ InvenTree | {{ order }}
<div class='col-sm-6'>
<h4>{% trans "Purchase Order Details" %}</h4>
<table class='table'>
<col width='25'>
<tr>
<td><span class='fas fa-industry'></span></td>
<td>{% trans "Supplier" %}</td>

View File

@ -33,6 +33,7 @@
{% if category %}
<h3>{% trans "Category Details" %}</h3>
<table class='table table-condensed table-striped'>
<col width='25'>
<tr>
<td><span class='fas fa-sitemap'></span></td>
<td>{% trans "Category Path" %}</td>
@ -71,6 +72,7 @@
{% else %}
<h3>{% trans "Category Details" %}</h3>
<table class='table table-striped table-condensed'>
<col width='25'>
<tr>
<td><span class='fas fa-sitemap'></span></td>
<td>{% trans "Part Categories" %}</td>

View File

@ -13,6 +13,7 @@
<div class='row'>
<div class='col-sm-6'>
<table class='table table-striped'>
<col width='25'>
<tr>
<td></td>
<td><b>{% trans "Part name" %}</b></td>

View File

@ -70,6 +70,7 @@
</div>
</p>
<table class='table table-condensed'>
<col width='25'>
{% if part.IPN %}
<tr>
<td></td>

View File

@ -73,6 +73,7 @@
<div class='row'>
<div class='col-sm-6'>
<table class="table table-striped">
<col width='25'>
<tr>
<td><span class='fas fa-shapes'></span></td>
<td>Part</td>

View File

@ -36,6 +36,7 @@
{% if location %}
<h3>{% trans "Location Details" %}</h3>
<table class='table table-striped table-condensed'>
<col width='25'>
<tr>
<td><span class='fas fa-sitemap'></span></td>
<td>{% trans "Location Path" %}</td>
@ -60,6 +61,7 @@
{% else %}
<h3>{% trans "Stock Details" %}</h3>
<table class='table table-striped table-condensed'>
<col width='25'>
<tr>
<td><span class='fas fa-map-marker-alt'></span></td>
<td>{% trans "Stock Locations" %}</td>

View File

@ -24,10 +24,16 @@ InvenTree | Index
{% endblock %}
{% block js_ready %}
console.log("abcde?");
{{ block.super }}
$("#to-build-table").bootstrapTable();
$("#to-order-table").bootstrapTable();
$("#starred-parts-table").bootstrapTable();
//TODO: These calls to bootstrapTable() are failing, for some reason?
//$("#to-build-table").bootstrapTable();
//$("#to-order-table").bootstrapTable();
//$("#starred-parts-table").bootstrapTable();
console.log("Got to here...");
{% endblock %}

View File

@ -1,11 +1,11 @@
<table class='table table-striped table-condensed' id='{{ table_id }}'>
<tr>
<th>Part</th>
<th>Description</th>
<th>In Stock</th>
<th>On Order</th>
<th>Allocted</th>
<th>Net Stock</th>
<th data-field='part' data-sortable='true' data-searchable='true'>Part</th>
<th data-field='part' data-sortable='true' data-searchable='true'>Description</th>
<th data-field='part' data-sortable='true' data-searchable='true'>In Stock</th>
<th data-field='part' data-sortable='true' data-searchable='true'>On Order</th>
<th data-field='part' data-sortable='true' data-searchable='true'>Allocted</th>
<th data-field='part' data-sortable='true' data-searchable='true'>Net Stock</th>
</tr>
{% for part in parts %}
<tr>