mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-06 20:45:30 +00:00
Bootstrap 5 & remove jQuery (#661)
* build: move frontend assets to Bootstrap 5.3 and Tom Select * feat: migrate templates and scripts to Bootstrap 5, dropping jQuery Templates - Rename Bootstrap 4 classes and data attributes (data-bs-*, ms-/me-/ps-/pe-, text-start/end, form-group -> mb-3, input-group wrappers removed, badges, custom controls -> form-check/form-select, media -> d-flex, btn-close, ...) - Dark mode now uses Bootstrap 5.3 colour modes (data-bs-theme on <html>), set from <head> to avoid a flash of the light theme - Remove the Bootstrap 4 /bootstrap/ demo page - Contextual table classes (table-success etc.) still work as plain backgrounds for the rigboard key JavaScript - Remove jQuery: src.js/interaction.js and every inline template script are rewritten in plain JS on top of small helpers (helpers.js, bundled with Bootstrap into jpop.js so inline scripts can use them) - Replace bootstrap-select/ajax-bootstrap-select with Tom Select. The remote search now sends the `q` parameter and reads `text`, which is what the API actually uses (the old picker sent `term` and read `label`) - HTML fragments are fetched with an X-Requested-With header so views keep rendering their modal variants, and fetched scripts are re-executed - Remove the Bootstrap 4 plugin script includes * fix: stop rigboard header buttons stretching to full width under Bootstrap 5 * fix: restore dark-mode brand colours and contextual table colours under Bootstrap 5 * fix: brighten dark-mode links and make coloured card outlines visible * fix: calendar layout and grid borders, navbar search button width, guard missing modal links * fix: readable text in dark-mode Tom Select inputs and placeholders, restore form-control column widths * build: split the Dockerfile into cached stages with prod and dev targets * deploy: make compose.yml development-only with live reload, and document it * fix: keep badge text colour for links inside badges * fix: restore table-bordered grid lines in dark mode * fix: include Bootstrap's progress styles and keep progress labels readable
This commit is contained in:
@@ -8,11 +8,11 @@
|
||||
if(today) {
|
||||
date = new Date();
|
||||
}
|
||||
$('#id_date_acquired').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'));
|
||||
document.getElementById('id_date_acquired').value = [date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-');
|
||||
return false;
|
||||
}
|
||||
function setFieldValue(ID, CSA) {
|
||||
$('#' + String(ID)).val(CSA);
|
||||
document.getElementById(String(ID)).value = CSA;
|
||||
return false;
|
||||
}
|
||||
function checkIfCableHidden() {
|
||||
@@ -24,46 +24,46 @@
|
||||
{% include 'form_errors.html' %}
|
||||
{% csrf_token %}
|
||||
<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.asset_id col="col-6" %}
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.description col="col-6" %}
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.category col="col-6" %}
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.status col="col-6" %}
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.serial_number col="col-6" %}
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.date_acquired col="col-6" %}
|
||||
<div class="col-sm-2">
|
||||
<button class="btn btn-info" onclick="return setAcquired(true);" tabindex="-1">Today</button>
|
||||
<button class="btn btn-warning" onclick="return setAcquired(false);" tabindex="-1">Unknown</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.date_sold col="col-6" %}
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.replacement_cost col="col-6" prepend="£" %}
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
<label for="{{ form.is_cable.id_for_label }}" class="col-2">Cable?</label>
|
||||
<div class="col-6">
|
||||
{% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
|
||||
</div>
|
||||
</div>
|
||||
<div id="cable-table">
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.cable_type col="col-6" %}
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
|
||||
<div class="col-4">
|
||||
<button class="btn btn-danger" onclick="return setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1" type="button">5{{ form.length.help_text }}</button>
|
||||
@@ -71,7 +71,7 @@
|
||||
<button class="btn btn-info" onclick="return setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1" type="button">20{{ form.length.help_text }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
{% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
|
||||
<div class="col-4">
|
||||
<button class="btn btn-secondary" onclick="return setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1" type="button">1.5{{ form.csa.help_text }}</button>
|
||||
@@ -80,7 +80,7 @@
|
||||
</div>
|
||||
</div>
|
||||
{% if not is_ajax %}
|
||||
<div class="form-group form-row pull-right">
|
||||
<div class="mb-3 row g-2 float-end">
|
||||
<button class="btn btn-success" type="submit" form="asset_audit_form" id="id_mark_audited">Mark Audited</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
@@ -88,7 +88,7 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block footer %}
|
||||
<div class="form-group form-row">
|
||||
<button class="btn btn-success pull-right" type="submit" form="asset_audit_form" onclick="onAuditClick({{form.asset_id.value}});" id="id_mark_audited">Mark Audited</button>
|
||||
<div class="mb-3 row g-2">
|
||||
<button class="btn btn-success float-end" type="submit" form="asset_audit_form" onclick="onAuditClick({{form.asset_id.value}});" id="id_mark_audited">Mark Audited</button>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -5,59 +5,53 @@
|
||||
|
||||
{% block js %}
|
||||
<script>
|
||||
$('document').ready(function(){
|
||||
$('#asset-search-form').submit(function () {
|
||||
$('#searchButton').focus().click();
|
||||
return false;
|
||||
ready(function(){
|
||||
document.getElementById('asset-search-form').addEventListener('submit', function (e) {
|
||||
e.preventDefault();
|
||||
document.getElementById('searchButton').focus();
|
||||
document.getElementById('searchButton').click();
|
||||
});
|
||||
$('#searchButton').click(function (e) {
|
||||
document.getElementById('searchButton').addEventListener('click', function (e) {
|
||||
e.preventDefault();
|
||||
var url = "{% url 'asset_audit' None %}".replace('None', $("#{{form.q.id_for_label}}").val());
|
||||
$.ajax({
|
||||
url: url,
|
||||
success: function(){
|
||||
$link = $(this);
|
||||
// Anti modal inception
|
||||
if ($link.parents('#modal').length === 0) {
|
||||
modaltarget = $link.data('target');
|
||||
modalobject = "";
|
||||
$('#modal').load(url, function (e) {
|
||||
$('#modal').modal();
|
||||
});
|
||||
var url = "{% url 'asset_audit' None %}".replace('None', document.getElementById("{{form.q.id_for_label}}").value);
|
||||
fetch(url, {method: 'HEAD', credentials: 'same-origin'})
|
||||
.then(function (response) {
|
||||
if (!response.ok) {
|
||||
throw new Error(response.statusText);
|
||||
}
|
||||
},
|
||||
error:function(){
|
||||
$("#error404").attr("hidden", false);
|
||||
}
|
||||
});
|
||||
modaltarget = undefined;
|
||||
modalobject = "";
|
||||
return loadModal(url);
|
||||
})
|
||||
.catch(function () {
|
||||
document.getElementById("error404").hidden = false;
|
||||
});
|
||||
});
|
||||
});
|
||||
function onAuditClick(assetID) {
|
||||
$('#' + assetID).remove();
|
||||
document.getElementById(assetID).remove();
|
||||
}
|
||||
$('#modal').on('hidden.bs.modal', function (e) {
|
||||
searchbar = document.getElementById('id_q');
|
||||
document.getElementById('modal').addEventListener('hidden.bs.modal', function () {
|
||||
var searchbar = document.getElementById('id_q');
|
||||
searchbar.value = "";
|
||||
setTimeout(searchbar.focus(), 2000);
|
||||
})
|
||||
searchbar.focus();
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="error404" class="alert alert-danger alert-dismissable" hidden=true>
|
||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
||||
<span>Asset with that ID does not exist!</span>
|
||||
</div>
|
||||
|
||||
<form id="asset-search-form" class="mb-3" method="GET">
|
||||
<div class="form-group form-row">
|
||||
<div class="mb-3 row g-2">
|
||||
<h3>Audit Asset:</h3>
|
||||
<div class="input-group input-group-lg">
|
||||
{% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
|
||||
<div class="input-group-append">
|
||||
<label for="q" class="sr-only">Asset ID:</label>
|
||||
<label for="q" class="visually-hidden">Asset ID:</label>
|
||||
<a id="searchButton" class="btn btn-primary" class="submit" type="submit">Search</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -16,30 +16,18 @@
|
||||
|
||||
{% block js %}
|
||||
{{ block.super }}
|
||||
<script src="{% static 'js/autocompleter.js' %}"></script>
|
||||
<script>
|
||||
const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
|
||||
dur = matches ? 0 : 500;
|
||||
function checkIfCableHidden() {
|
||||
if ($("#id_is_cable").prop('checked')) {
|
||||
$("#cable-table").slideDown(dur);
|
||||
if (document.getElementById("id_is_cable").checked) {
|
||||
slideDown(document.getElementById("cable-table"), dur);
|
||||
} else {
|
||||
$("#cable-table").slideUp(dur);
|
||||
slideUp(document.getElementById("cable-table"), dur);
|
||||
}
|
||||
}
|
||||
checkIfCableHidden();
|
||||
</script>
|
||||
<script>
|
||||
$('document').ready(function(){
|
||||
$(document).find(".selectpicker").selectpicker().each(function(){initPicker($(this))});
|
||||
});
|
||||
</script>
|
||||
<script src="{% static "js/tooltip.js" %}"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
$('[data-toggle="tooltip"]').tooltip();
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
@@ -62,26 +62,26 @@
|
||||
<div class="row">
|
||||
<div class="col px-0">
|
||||
<form id="asset-search-form" method="GET">
|
||||
<div class="form-row">
|
||||
<div class="row g-2">
|
||||
<div class="col">
|
||||
<div class="input-group px-1 mb-2 mb-sm-0 flex-nowrap">
|
||||
{% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID/Desc/Serial' %}
|
||||
<label for="q" class="sr-only">Asset ID/Description/Serial Number:</label>
|
||||
<span class="input-group-append">{% button 'search' id="id_search" %}</span>
|
||||
<label for="q" class="visually-hidden">Asset ID/Description/Serial Number:</label>
|
||||
{% button 'search' id="id_search" %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row mt-2">
|
||||
<div class="row g-2 mt-2">
|
||||
<div class="col">
|
||||
<div id="category-group" class="form-group px-1" style="margin-bottom: 0;">
|
||||
<label for="category" class="sr-only">Category</label>
|
||||
{% render_field form.category|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
|
||||
<div id="category-group" class="mb-3 px-1" style="margin-bottom: 0;">
|
||||
<label for="category" class="visually-hidden">Category</label>
|
||||
{% render_field form.category|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div id="status-group" class="form-group px-1" style="margin-bottom: 0;">
|
||||
<label for="status" class="sr-only">Status</label>
|
||||
{% render_field form.status|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
|
||||
<div id="status-group" class="mb-3 px-1" style="margin-bottom: 0;">
|
||||
<label for="status" class="visually-hidden">Status</label>
|
||||
{% render_field form.status|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col mt-2">
|
||||
@@ -91,12 +91,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<div class="form-group d-flex flex-nowrap">
|
||||
<div class="mb-3 d-flex flex-nowrap">
|
||||
<label for="date_acquired" class="text-nowrap mt-auto">Date Acquired</label>
|
||||
{% render_field form.date_acquired|add_class:'form-control mx-2' %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto mr-auto">
|
||||
<div class="col-auto me-auto">
|
||||
<button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -104,7 +104,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row my-2">
|
||||
<div class="col text-right px-0">
|
||||
<div class="col text-end px-0">
|
||||
{% button 'new' 'asset_create' style="width: 6em" %}
|
||||
{% if object_list %}
|
||||
<a class="btn btn-primary" href="{% url 'generate_labels' object_list|ids_from_objects %}"><span class="fas fa-barcode"></span> Generate Labels</a>
|
||||
@@ -114,9 +114,9 @@
|
||||
<div class="row my-2">
|
||||
<div class="col bg-dark text-white rounded pt-3">
|
||||
{# TODO Gotta be a cleaner way to do this... #}
|
||||
<p><span class="ml-2">Active Filters: </span> {% for filter in category_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
|
||||
<p><span class="ms-2">Active Filters: </span> {% for filter in category_filters %}<span class="badge text-bg-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ms-1 align-baseline">
|
||||
<span aria-hidden="true" class="fas fa-times" onclick="removeQString('category', '{{filter.id}}')"></span>
|
||||
</button></span>{%endfor%}{% for filter in status_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
|
||||
</button></span>{%endfor%}{% for filter in status_filters %}<span class="badge text-bg-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ms-1 align-baseline">
|
||||
<span aria-hidden="true" class="fas fa-times" onclick="removeQString('status', '{{filter.id}}')"></span>
|
||||
</button></span>{%endfor%}</p>
|
||||
</div>
|
||||
|
||||
@@ -9,8 +9,7 @@
|
||||
|
||||
<script>
|
||||
function insertInParentField(pk, str) {
|
||||
$('#hidden_parent_id').val(pk);
|
||||
$('#parent_id').val(str);
|
||||
M.updateTextFields();
|
||||
document.getElementById('hidden_parent_id').value = pk;
|
||||
document.getElementById('parent_id').value = str;
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
{% block titleelements %}
|
||||
<li class="nav-item"><a class="nav-link" href="/">Home</a></li>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Assets</a>
|
||||
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Assets</a>
|
||||
<div class="dropdown-menu">
|
||||
<a class="dropdown-item" href="{% url 'asset_list' %}"><span class="fas fa-list"></span> List Assets</a>
|
||||
{% if perms.assets.add_asset %}
|
||||
@@ -25,7 +25,7 @@
|
||||
</div>
|
||||
</li>
|
||||
<div class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Suppliers</a>
|
||||
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Suppliers</a>
|
||||
<ul class="dropdown-menu">
|
||||
<a class="dropdown-item" href="{% url 'supplier_list' %}"><span class="fas fa-list"></span> List Suppliers</a>
|
||||
{% if perms.assets.add_supplier %}
|
||||
|
||||
@@ -62,41 +62,41 @@
|
||||
<div class="row">
|
||||
<div class="col px-0">
|
||||
<form id="asset-search-form" method="GET">
|
||||
<div class="form-row">
|
||||
<div class="row g-2">
|
||||
<div class="col">
|
||||
<div class="input-group px-1 mb-2 mb-sm-0 flex-nowrap">
|
||||
{% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID/Desc/Serial' %}
|
||||
<label for="q" class="sr-only">Asset ID/Description/Serial Number:</label>
|
||||
<span class="input-group-append">{% button 'search' id="id_search" %}</span>
|
||||
<label for="q" class="visually-hidden">Asset ID/Description/Serial Number:</label>
|
||||
{% button 'search' id="id_search" %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row mt-2">
|
||||
<div class="row g-2 mt-2">
|
||||
<div class="col">
|
||||
<div id="category-group" class="form-group px-1">
|
||||
<label for="category" class="sr-only">Category</label>
|
||||
{% render_field form.category|attr:'multiple'|add_class:'selectpicker col-sm pl-0' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
|
||||
<div id="category-group" class="mb-3 px-1">
|
||||
<label for="category" class="visually-hidden">Category</label>
|
||||
{% render_field form.category|attr:'multiple'|add_class:'ts-select col-sm ps-0' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div id="status-group" class="form-group px-1">
|
||||
<label for="status" class="sr-only">Status</label>
|
||||
{% render_field form.status|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
|
||||
<div id="status-group" class="mb-3 px-1">
|
||||
<label for="status" class="visually-hidden">Status</label>
|
||||
{% render_field form.status|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="form-group d-flex flex-nowrap">
|
||||
<label for="cable_type" class="sr-only">Cable Type</label>
|
||||
{% render_field form.cable_type|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Cable Type" data-header="Cable Type" data-actions-box="true" %}
|
||||
<div class="mb-3 d-flex flex-nowrap">
|
||||
<label for="cable_type" class="visually-hidden">Cable Type</label>
|
||||
{% render_field form.cable_type|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Cable Type" data-header="Cable Type" data-actions-box="true" %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<div class="form-group d-flex flex-nowrap">
|
||||
<div class="mb-3 d-flex flex-nowrap">
|
||||
<label for="date_acquired" class="text-nowrap mt-auto">Date Acquired</label>
|
||||
{% render_field form.date_acquired|add_class:'form-control mx-2' %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto mr-auto">
|
||||
<div class="col-auto me-auto">
|
||||
<button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -104,7 +104,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row my-2">
|
||||
<div class="col text-right px-0">
|
||||
<div class="col text-end px-0">
|
||||
{% button 'new' 'asset_create' style="width: 6em" %}
|
||||
{% if object_list %}
|
||||
<a class="btn btn-primary" href="{% url 'generate_labels' object_list|ids_from_objects %}"><span class="fas fa-barcode"></span> Generate Labels</a>
|
||||
@@ -114,9 +114,9 @@
|
||||
<div class="row my-2">
|
||||
<div class="col bg-dark text-white rounded pt-3">
|
||||
{# TODO Gotta be a cleaner way to do this... #}
|
||||
<p><span class="ml-2">Active Filters: </span> {% for filter in category_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
|
||||
<p><span class="ms-2">Active Filters: </span> {% for filter in category_filters %}<span class="badge text-bg-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ms-1 align-baseline">
|
||||
<span aria-hidden="true" class="fas fa-times" onclick="removeQString('category', '{{filter.id}}')"></span>
|
||||
</button></span>{%endfor%}{% for filter in status_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
|
||||
</button></span>{%endfor%}{% for filter in status_filters %}<span class="badge text-bg-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ms-1 align-baseline">
|
||||
<span aria-hidden="true" class="fas fa-times" onclick="removeQString('status', '{{filter.id}}')"></span>
|
||||
</button></span>{%endfor%}</p>
|
||||
</div>
|
||||
@@ -125,7 +125,7 @@
|
||||
<div class="col px-0">
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<thead class="thead-dark">
|
||||
<thead class="table-dark">
|
||||
<tr>
|
||||
<th scope="col">Asset ID</th>
|
||||
<th scope="col">Description</th>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col mt-2 text-right">
|
||||
<div class="col mt-2 text-end">
|
||||
{% button 'edit' url='cable_type_update' pk=object.id %}
|
||||
</div>
|
||||
{% cache None cable_type_assets object %}
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
{% for field in form %}
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
{% include 'partials/form_field.html' with field=field %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="text-right">
|
||||
<div class="text-end">
|
||||
{% button 'submit' %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
{% block content %}
|
||||
<div class="row my-2">
|
||||
<div class="col text-right pr-0">
|
||||
<div class="col text-end pe-0">
|
||||
{% button 'new' 'cable_type_create' %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{% load button from filters %}
|
||||
<div class="text-right py-2">
|
||||
<div class="text-end py-2">
|
||||
{% if create or edit and object %}
|
||||
<!--edit-->
|
||||
{% button 'submit' %}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if create or edit or duplicate %}
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
|
||||
{% if duplicate %}
|
||||
{% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
|
||||
@@ -17,32 +17,32 @@
|
||||
{% render_field form.asset_id|add_class:'form-control' %}
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.description.id_for_label }}">Description</label>
|
||||
{% render_field form.description|add_class:'form-control' value=object.description %}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.nickname.id_for_label }}">Nickname</label>
|
||||
{% render_field form.nickname|add_class:'form-control' value=object.nickname %}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.category.id_for_label }}" >Category</label>
|
||||
{% render_field form.category|add_class:'form-control'%}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.status.id_for_label }}" >Status</label>
|
||||
{% render_field form.status|add_class:'form-control'%}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
|
||||
{% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.is_cable.id_for_label }}">Cable?</label>
|
||||
{% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
|
||||
</div>
|
||||
<!---TODO: Lower default number of lines in comments box-->
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.comments.id_for_label }}">Comments</label>
|
||||
{% render_field form.comments|add_class:'form-control md-enabled' %}
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% load button from filters %}
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<thead class="thead-dark">
|
||||
<thead class="table-dark">
|
||||
<tr>
|
||||
<th scope="col">Asset ID</th>
|
||||
<th scope="col">Description</th>
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
Audit Details
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<p>Audited at <span class="badge badge-secondary">{{ object.last_audited_at|default_if_none:'-' }}</span> by <span class="badge badge-info">{{ object.last_audited_by|default_if_none:'-' }}</span></p>
|
||||
<p>Audited at <span class="badge text-bg-secondary">{{ object.last_audited_at|default_if_none:'-' }}</span> by <span class="badge text-bg-info">{{ object.last_audited_by|default_if_none:'-' }}</span></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if create or edit or duplicate %}
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
{% include 'partials/form_field.html' with field=form.cable_type %}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
{% include 'partials/form_field.html' with field=form.length append=form.length.help_text %}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
{% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text %}
|
||||
</div>
|
||||
{% else %}
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if create or edit or duplicate %}
|
||||
<div class="form-group" id="parent-group">
|
||||
<label for="selectpicker">Set Parent</label>
|
||||
<select name="parent" id="parent_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='asset' %}?fields=asset_id,description">
|
||||
<div class="mb-3" id="parent-group">
|
||||
<label for="ts-select">Set Parent</label>
|
||||
<select name="parent" id="parent_id" class="ts-select" data-live-search="true" data-sourceurl="{% url 'api_secure' model='asset' %}?fields=asset_id,description">
|
||||
{% if object.parent %}
|
||||
<option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
|
||||
{% endif %}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if create or edit or duplicate %}
|
||||
<div class="form-group" id="purchased-from-group">
|
||||
<div class="mb-3" id="purchased-from-group">
|
||||
<label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
|
||||
<select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="ts-select" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
|
||||
{% if object.purchased_from %}
|
||||
<option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
|
||||
{% endif %}
|
||||
@@ -19,10 +19,10 @@
|
||||
<div class="col align-right">
|
||||
<div class="btn-group">
|
||||
<a href="{% url 'supplier_create' %}" class="btn btn-success modal-href"
|
||||
data-target="#{{ form.purchased_from.id_for_label }}">
|
||||
data-select-target="#{{ form.purchased_from.id_for_label }}">
|
||||
<span class="fas fa-plus"></span>
|
||||
</a>
|
||||
<a {% if form.supplier.value %}href="{% url 'supplier_update' form.purchased_from.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.purchased_from.id_for_label }}-update" data-target="#{{ form.purchased_from.id_for_label }}">
|
||||
<a {% if form.supplier.value %}href="{% url 'supplier_update' form.purchased_from.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.purchased_from.id_for_label }}-update" data-select-target="#{{ form.purchased_from.id_for_label }}">
|
||||
<span class="fas fa-edit"></span>
|
||||
</a>
|
||||
</div>
|
||||
@@ -30,23 +30,23 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend"><span class="input-group-text">£</span></div>
|
||||
<span class="input-group-text">£</span>
|
||||
{% render_field form.purchase_price|add_class:'form-control'|set_data:"toggle:tooltip" value=object.purchase_price title="Ex. VAT" %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.salvage_value.id_for_label }}">Replacement Cost</label>
|
||||
<div class="input-group">
|
||||
<div class="input-group-prepend"><span class="input-group-text">£</span></div>
|
||||
<span class="input-group-text">£</span>
|
||||
{% render_field form.replacement_cost|add_class:'form-control'|set_data:"toggle:tooltip" value=object.replacement_cost title="Ex. VAT" %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
|
||||
{% if object.date_acquired%}
|
||||
{% with date_acq=object.date_acquired|date:"Y-m-d" %}
|
||||
@@ -58,7 +58,7 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="mb-3">
|
||||
<label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
|
||||
{% with date_sol=object.form.date_sold|date:"Y-m-d" %}
|
||||
{% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=date_sol %}
|
||||
|
||||
Reference in New Issue
Block a user