inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 13:15:43 +00:00
Code Activity

Refactor "manufacturer_part" view

Browse Source
This commit is contained in:
Oliver
2021-10-27 22:52:11 +11:00
parent 9536231cb0
commit fe25ce8cd1
12 changed files with 105 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
InvenTree/InvenTree/static/css/inventree.css
View File

@@ -511,14 +511,8 @@
.table-price-three tr td:last-child { .table-price-three tr td:last-child {
width: 30%; width: 30%;
} }
/* !pricing table widths */
.btn-glyph { /* !pricing table widths */
padding-left: 6px;
padding-right: 6px;
padding-top: 3px;
padding-bottom: 2px;
}
.action-button { .action-button {
font-size: 125%; font-size: 125%;

101
InvenTree/build/templates/build/build_base.html
View File

@@ -14,59 +14,56 @@
<li class="breadcrumb-item active" aria-current="page"><a href='{% url "build-detail" build.id %}'>{{ build }}</a></li> <li class="breadcrumb-item active" aria-current="page"><a href='{% url "build-detail" build.id %}'>{{ build }}</a></li>
{% endblock %} {% endblock %}
{% block details_left %} {% block thumbnail %}
<div class='row g-0'> <img class="part-thumb"
<div class='col-md-4'> {% if build.part.image %}
<img class="part-thumb" src="{{ build.part.image.url }}"
{% if build.part.image %} {% else %}
src="{{ build.part.image.url }}" src="{% static 'img/blank_image.png' %}"
{% else %} {% endif %}/>
src="{% static 'img/blank_image.png' %}" {% endblock %}
{% endif %}/>
</div>
<div class='col-md-8'>
<h4>
{% trans "Build Order" %} {{ build }}
{% if user.is_staff and roles.build.change %}
<a href="{% url 'admin:build_build_change' build.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
{% endif %}
</h4>
<div class='btn-group' role='group'>
<!-- Printing options -->
<div class='btn-group'>
<button id='print-options' title='{% trans "Print actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
<span class='fas fa-print'></span> <span class='caret'></span>
</button>
<ul class='dropdown-menu' role='menu'>
<li><a class='dropdown-item' href='#' id='print-build-report'><span class='fas fa-file-pdf'></span> {% trans "Print build order report" %}</a></li>
</ul>
</div>
<!-- Build actions -->
{% if roles.build.change %}
<div class='btn-group'>
<button id='build-options' title='{% trans "Build actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
<span class='fas fa-tools'></span> <span class='caret'></span>
</button>
<ul class='dropdown-menu' role='menu'>
<li><a class='dropdown-item' href='#' id='build-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit Build" %}</a></li>
{% if build.is_active %}
<li><a class='dropdown-item' href='#' id='build-cancel'><span class='fas fa-times-circle icon-red'></span> {% trans "Cancel Build" %}</a></li>
{% endif %}
{% if build.status == BuildStatus.CANCELLED and roles.build.delete %}
<li><a class='dropdown-item' href='#' id='build-delete'><span class='fas fa-trash-alt'></span> {% trans "Delete Build" %}</a>
{% endif %}
</ul>
</div>
{% if build.active %}
<button id='build-complete' title='{% trans "Complete Build" %}' class='btn btn-success'>
<span class='fas fa-check-circle'></span>
</button>
{% endif %}
{% endif %}
</div>
</div>
</div>
{% block details %}
<h4>
{% trans "Build Order" %} {{ build }}
{% if user.is_staff and roles.build.change %}
<a href="{% url 'admin:build_build_change' build.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
{% endif %}
</h4>
<p>{{ build.title }}</p>
<div class='btn-group' role='group'>
<!-- Printing options -->
<div class='btn-group'>
<button id='print-options' title='{% trans "Print actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
<span class='fas fa-print'></span> <span class='caret'></span>
</button>
<ul class='dropdown-menu' role='menu'>
<li><a class='dropdown-item' href='#' id='print-build-report'><span class='fas fa-file-pdf'></span> {% trans "Print build order report" %}</a></li>
</ul>
</div>
<!-- Build actions -->
{% if roles.build.change %}
<div class='btn-group'>
<button id='build-options' title='{% trans "Build actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
<span class='fas fa-tools'></span> <span class='caret'></span>
</button>
<ul class='dropdown-menu' role='menu'>
<li><a class='dropdown-item' href='#' id='build-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit Build" %}</a></li>
{% if build.is_active %}
<li><a class='dropdown-item' href='#' id='build-cancel'><span class='fas fa-times-circle icon-red'></span> {% trans "Cancel Build" %}</a></li>
{% endif %}
{% if build.status == BuildStatus.CANCELLED and roles.build.delete %}
<li><a class='dropdown-item' href='#' id='build-delete'><span class='fas fa-trash-alt'></span> {% trans "Delete Build" %}</a>
{% endif %}
</ul>
</div>
{% if build.active %}
<button id='build-complete' title='{% trans "Complete Build" %}' class='btn btn-success'>
<span class='fas fa-check-circle'></span>
</button>
{% endif %}
{% endif %}
</div>
{% endblock %} {% endblock %}
{% block details_right %} {% block details_right %}

4
InvenTree/company/templates/company/company_base.html
View File

@@ -20,10 +20,10 @@
{% endif %}/> {% endif %}/>
<div class='btn-row part-thumb-overlay'> <div class='btn-row part-thumb-overlay'>
<div class='btn-group'> <div class='btn-group'>
<button type='button' class='btn btn-outline-secondary btn-glyph' title='{% trans "Upload new image" %}' id='company-image-upload'><span class='fas fa-file-upload'></span></button> <button type='button' class='btn btn-outline-secondary' title='{% trans "Upload new image" %}' id='company-image-upload'><span class='fas fa-file-upload'></span></button>
{% settings_value "INVENTREE_DOWNLOAD_FROM_URL" as allow_download %} {% settings_value "INVENTREE_DOWNLOAD_FROM_URL" as allow_download %}
{% if allow_download %} {% if allow_download %}
<button type='button' class='btn btn-outline-secondary btn-glyph' title="{% trans 'Download image from URL' %}" id='company-image-url'><span class='fas fa-cloud-download-alt'></span></button> <button type='button' class='btn btn-outline-secondary' title="{% trans 'Download image from URL' %}" id='company-image-url'><span class='fas fa-cloud-download-alt'></span></button>
{% endif %} {% endif %}
</div> </div>
</div> </div>

54
InvenTree/company/templates/company/manufacturer_part.html
View File

@@ -1,4 +1,4 @@
{% extends "two_column.html" %} {% extends "page_base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
@@ -10,6 +10,14 @@ InvenTree | {% trans "Manufacturer Part" %}
{% include "company/manufacturer_part_navbar.html" %} {% include "company/manufacturer_part_navbar.html" %}
{% endblock %} {% endblock %}
{% block breadcrumbs %}
<li class='breadcrumb-item'><a href='{% url "manufacturer-index" %}'>{% trans "Manufacturers" %}</a></li>
{% if part.manufacturer %}
<li class='breadcrumb-item'><a href='{% url "company-detail" part.manufacturer.id %}'>{{ part.manufacturer.name }}</a></li>
{% endif %}
<li class="breadcrumb-item active" aria-current="page"><a href='{% url "manufacturer-part-detail" part.id %}'>{{ part.MPN }}</a></li>
{% endblock %}
{% block thumbnail %} {% block thumbnail %}
<img class='part-thumb' <img class='part-thumb'
{% if part.part.image %} {% if part.part.image %}
@@ -19,46 +27,40 @@ src="{% static 'img/blank_image.png' %}"
{% endif %}/> {% endif %}/>
{% endblock %} {% endblock %}
{% block page_data %} {% block details %}
<h3>{% trans "Manufacturer Part" %}</h3>
<hr>
<h4> <h4>
{{ part.part.full_name }} {% trans "Manufacturer Part" %}: {{ part.part.full_name }}
{% if user.is_staff and perms.company.change_company %} {% if user.is_staff and perms.company.change_company %}
<a href="{% url 'admin:company_supplierpart_change' part.pk %}"> <a href="{% url 'admin:company_supplierpart_change' part.pk %}">
<span title='{% trans "Admin view" %}' class='fas fa-user-shield'></span> <span title='{% trans "Admin view" %}' class='fas fa-user-shield'></span>
</a> </a>
{% endif %} {% endif %}
</h4> </h4>
<p>{{ part.manufacturer.name }} - {{ part.MPN }}</p>
{% if roles.purchase_order.change %} {% if roles.purchase_order.change %}
<div class='btn-row'> <div class='btn-group' role='group'>
<div class='btn-group action-buttons' role='group'> {% comment "for later" %}
{% comment "for later" %} {% if roles.purchase_order.add %}
{% if roles.purchase_order.add %} <button type='button' class='btn btn-outline-secondary' id='order-part' title='{% trans "Order part" %}'>
<button type='button' class='btn btn-default btn-glyph' id='order-part' title='{% trans "Order part" %}'> <span class='fas fa-shopping-cart'></span>
<span class='fas fa-shopping-cart'></span> </button>
</button> {% endif %}
{% endif %} {% endcomment %}
{% endcomment %} <button type='button' class='btn btn-outline-secondary' id='edit-part' title='{% trans "Edit manufacturer part" %}'>
<button type='button' class='btn btn-default btn-glyph' id='edit-part' title='{% trans "Edit manufacturer part" %}'> <span class='fas fa-edit icon-green'/>
<span class='fas fa-edit icon-green'/> </button>
</button> {% if roles.purchase_order.delete %}
{% if roles.purchase_order.delete %} <button type='button' class='btn btn-outline-secondary' id='delete-part' title='{% trans "Delete manufacturer part" %}'>
<button type='button' class='btn btn-default btn-glyph' id='delete-part' title='{% trans "Delete manufacturer part" %}'> <span class='fas fa-trash-alt icon-red'/>
<span class='fas fa-trash-alt icon-red'/> </button>
</button> {% endif %}
{% endif %}
</div>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block page_details %} {% block details_right %}
<h4>{% trans "Manufacturer Part Details" %}</h4>
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">
<col width='25'> <col width='25'>
<tr> <tr>

6
InvenTree/company/templates/company/supplier_part.html
View File

@@ -37,15 +37,15 @@ src="{% static 'img/blank_image.png' %}"
<div class='btn-row'> <div class='btn-row'>
<div class='btn-group action-buttons' role='group'> <div class='btn-group action-buttons' role='group'>
{% if roles.purchase_order.add %} {% if roles.purchase_order.add %}
<button type='button' class='btn btn-default btn-glyph' id='order-part' title='{% trans "Order part" %}'> <button type='button' class='btn btn-default' id='order-part' title='{% trans "Order part" %}'>
<span class='fas fa-shopping-cart'></span> <span class='fas fa-shopping-cart'></span>
</button> </button>
{% endif %} {% endif %}
<button type='button' class='btn btn-default btn-glyph' id='edit-part' title='{% trans "Edit supplier part" %}'> <button type='button' class='btn btn-default' id='edit-part' title='{% trans "Edit supplier part" %}'>
<span class='fas fa-edit icon-green'/> <span class='fas fa-edit icon-green'/>
</button> </button>
{% if roles.purchase_order.delete %} {% if roles.purchase_order.delete %}
<button type='button' class='btn btn-default btn-glyph' id='delete-part' title='{% trans "Delete supplier part" %}'> <button type='button' class='btn btn-default' id='delete-part' title='{% trans "Delete supplier part" %}'>
<span class='fas fa-trash-alt icon-red'/> <span class='fas fa-trash-alt icon-red'/>
</button> </button>
{% endif %} {% endif %}

2
InvenTree/part/templates/part/detail.html
View File

@@ -211,7 +211,7 @@
<a href='/part/{{ part.id }}/'>{{ part }}</a> <a href='/part/{{ part.id }}/'>{{ part }}</a>
<div class='btn-group' style='float: right;'> <div class='btn-group' style='float: right;'>
{% if roles.part.change %} {% if roles.part.change %}
<button title='{% trans "Delete" %}' class='btn btn-default btn-glyph delete-related-part' url="{% url 'part-related-delete' part_related.id %}" type='button'><span class='fas fa-trash-alt icon-red'/></button> <button title='{% trans "Delete" %}' class='btn btn-default delete-related-part' url="{% url 'part-related-delete' part_related.id %}" type='button'><span class='fas fa-trash-alt icon-red'/></button>
{% endif %} {% endif %}
</div> </div>
</td> </td>

6
InvenTree/part/templates/part/part_thumb.html
View File

@@ -17,10 +17,10 @@
{% if roles.part.change %} {% if roles.part.change %}
<div class='btn-row part-thumb-overlay'> <div class='btn-row part-thumb-overlay'>
<div class='btn-group'> <div class='btn-group'>
<button type='button' class='btn btn-default btn-glyph' title="{% trans 'Select from existing images' %}" id='part-image-select'><span class='fas fa-th'></span></button> <button type='button' class='btn btn-default' title="{% trans 'Select from existing images' %}" id='part-image-select'><span class='fas fa-th'></span></button>
<button type='button' class='btn btn-default btn-glyph' title="{% trans 'Upload new image' %}" id='part-image-upload'><span class='fas fa-file-upload'></span></button> <button type='button' class='btn btn-default' title="{% trans 'Upload new image' %}" id='part-image-upload'><span class='fas fa-file-upload'></span></button>
{% if allow_download %} {% if allow_download %}
<button type='button' class='btn btn-default btn-glyph' title="{% trans 'Download image from URL' %}" id='part-image-url'><span class='fas fa-cloud-download-alt'></span></button> <button type='button' class='btn btn-default' title="{% trans 'Download image from URL' %}" id='part-image-url'><span class='fas fa-cloud-download-alt'></span></button>
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
InvenTree/templates/InvenTree/settings/setting.html
View File

@@ -38,7 +38,7 @@
</td> </td>
<td> <td>
<div class='btn-group float-right'> <div class='btn-group float-right'>
<button class='btn btn-default btn-glyph btn-edit-setting' pk='{{ setting.pk }}' setting='{{ setting.key.upper }}' title='{% trans "Edit setting" %}' {% if user_setting %}user='{{request.user.id}}'{% endif %}> <button class='btn btn-default btn-edit-setting' pk='{{ setting.pk }}' setting='{{ setting.key.upper }}' title='{% trans "Edit setting" %}' {% if user_setting %}user='{{request.user.id}}'{% endif %}>
<span class='fas fa-edit icon-green'></span> <span class='fas fa-edit icon-green'></span>
</button> </button>
</div> </div>

8
InvenTree/templates/InvenTree/settings/settings.html
View File

@@ -174,8 +174,8 @@ $('#cat-param-table').inventreeTable({
title: '{% trans "Default Value" %}', title: '{% trans "Default Value" %}',
sortable: 'true', sortable: 'true',
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>"; var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>";
var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>"; var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>";
var html = value var html = value
html += "<div class='btn-group float-right' role='group'>" + bEdit + bDel + "</div>"; html += "<div class='btn-group float-right' role='group'>" + bEdit + bDel + "</div>";
@@ -273,8 +273,8 @@ $("#param-table").inventreeTable({
}, },
{ {
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>"; var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>";
var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>"; var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>";
var html = "<div class='btn-group float-right' role='group'>" + bEdit + bDel + "</div>"; var html = "<div class='btn-group float-right' role='group'>" + bEdit + bDel + "</div>";

2
InvenTree/templates/js/translated/helpers.js
View File

@@ -103,7 +103,7 @@ function makeIconBadge(icon, title) {
*/ */
function makeIconButton(icon, cls, pk, title, options={}) { function makeIconButton(icon, cls, pk, title, options={}) {
var classes = `btn btn-default btn-glyph ${cls}`; var classes = `btn btn-default ${cls}`;
var id = `${cls}-${pk}`; var id = `${cls}-${pk}`;

4
InvenTree/templates/js/translated/stock.js
View File

@@ -1684,8 +1684,8 @@ function loadStockTrackingTable(table, options) {
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
// Manually created entries can be edited or deleted // Manually created entries can be edited or deleted
if (false && !row.system) { if (false && !row.system) {
var bEdit = "<button title='{% trans 'Edit tracking entry' %}' class='btn btn-entry-edit btn-default btn-glyph' type='button' url='/stock/track/" + row.pk + "/edit/'><span class='fas fa-edit'/></button>"; var bEdit = "<button title='{% trans 'Edit tracking entry' %}' class='btn btn-entry-edit btn-default' type='button' url='/stock/track/" + row.pk + "/edit/'><span class='fas fa-edit'/></button>";
var bDel = "<button title='{% trans 'Delete tracking entry' %}' class='btn btn-entry-delete btn-default btn-glyph' type='button' url='/stock/track/" + row.pk + "/delete/'><span class='fas fa-trash-alt icon-red'/></button>"; var bDel = "<button title='{% trans 'Delete tracking entry' %}' class='btn btn-entry-delete btn-default' type='button' url='/stock/track/" + row.pk + "/delete/'><span class='fas fa-trash-alt icon-red'/></button>";
return "<div class='btn-group' role='group'>" + bEdit + bDel + "</div>"; return "<div class='btn-group' role='group'>" + bEdit + bDel + "</div>";
} else { } else {

11
InvenTree/templates/page_base.html
View File

@@ -11,7 +11,16 @@
<div class='col-sm-6' id='detail-panel-left'> <div class='col-sm-6' id='detail-panel-left'>
<div class='card'> <div class='card'>
{% block details_left %} {% block details_left %}
block details_left <div class='row g-0'>
<div class='col-md-4'>
{% block thumbnail %}
{% endblock %}
</div>
<div class='col-md-8'>
{% block details %}
{% endblock %}
</div>
</div>
{% endblock %} {% endblock %}
</div> </div>
</div> </div>