arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 08:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Asset form fixes

Browse Source
This commit is contained in:
FreneticScribbler
2020-04-06 15:17:14 +01:00
parent 176324ed79
commit c8d0c0d5d0
5 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
assets/templates/asset_detail.html
View File

@@ -15,20 +15,21 @@
</div> </div>
<div class="row"> <div class="row">
{% if perms.assets.asset_finance %} {% if perms.assets.asset_finance %}
<div class="col-md-6"> <div class="col-md-6 py-3">
{% include 'partials/purchasedetails_form.html' %} {% include 'partials/purchasedetails_form.html' %}
</div> </div>
{% endif %} {% endif %}
<div class="col-md-6" {% if not object.is_cable %}hidden="true"{% endif %} id="cable-table"> <div class="col-md-6 py-3" {% if not object.is_cable %}hidden="true"{% endif %} id="cable-table">
{% include 'partials/cable_form.html' %} {% include 'partials/cable_form.html' %}
</div> </div>
<div class="col-md-4"> <div class="col-md-4 py-3">
{% include 'partials/parent_form.html' %} {% include 'partials/parent_form.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row justify-content-end">
<div class="col-md-12"> {% include 'partials/asset_buttons.html' %}
{% include 'partials/asset_buttons.html' %}
</div> </div>
<div class="row justify-content-end">
{% include 'partials/last_edited.html' with target="asset_history" id=object.asset_id %} {% include 'partials/last_edited.html' with target="asset_history" id=object.asset_id %}
</div>
{% endblock %} {% endblock %}

28
assets/templates/asset_form.html
View File

@@ -26,31 +26,29 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="page-header"> <h1>
<h1> {% if edit and object %}
{% if edit and object %} Edit Asset: {{ object.asset_id }}
Edit Asset: {{ object.asset_id }} {% elif duplicate %}
{% elif duplicate %} Duplication of Asset: {{ previous_asset_id }}
Duplication of Asset: {{ previous_asset_id }} {% else %}
{% else %} Create Asset
Create Asset {% endif %}
{% endif %} </h1>
</h1>
</div>
{% if duplicate %} {% if duplicate %}
<form method="post" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id %}"> <form method="POST" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id %}">
{% else %} {% else %}
<form method="post" id="asset_update_form" action="{% url 'asset_create' %}"> <form method="POST" id="asset_update_form" action="{% url 'asset_create' %}">
{% endif %} {% endif %}
{% include 'form_errors.html' %} {% include 'form_errors.html' %}
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true> <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
<div class="row"> <div class="row pt-4">
<div class="col-sm-12"> <div class="col-sm-12">
{% include 'partials/asset_detail_form.html' %} {% include 'partials/asset_detail_form.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row pt-4">
<div class="col-md-6"> <div class="col-md-6">
{% include 'partials/purchasedetails_form.html' %} {% include 'partials/purchasedetails_form.html' %}
</div> </div>

50
assets/templates/partials/asset_buttons.html
View File

@@ -1,25 +1,27 @@
{% if edit and object %} <div class="py-2">
<!--edit--> {% if edit and object %}
<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button> <!--edit-->
<a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a> <button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save</button>
{% elif duplicate %} {% elif duplicate %}
<!--duplicate--> <!--duplicate-->
<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button> <button type="submit" class="btn btn-success"><i class="fas fa-tick"></i> Create Duplicate</button>
{% elif create %} {% elif create %}
<!--create--> <!--create-->
<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button> <button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save</button>
{% else %} {% else %}
<!--detail view--> <!--detail view-->
<div class="btn-group"> <div class="btn-group">
<a href="{% url 'asset_update' object.asset_id %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a> <a href="{% url 'asset_update' object.asset_id %}" class="btn btn-warning"><i class="fas fa-edit"></i> Edit</a>
<a class="btn btn-default" href="{% url 'asset_duplicate' object.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a> <a class="btn btn-info" href="{% url 'asset_duplicate' object.asset_id %}"><i class="fas fa-clone"></i> Duplicate</a>
</div>
{% endif %}
{% if create or edit or duplicate %}
<br>
<button type="reset" class="btn btn-link" onclick="
{% if duplicate %}
{% url 'asset_detail' previous_asset_id %}
{% else %}
history.back()
{% endif %}">Cancel</button>
{% endif %}
</div> </div>
{% endif %}
{% if create or edit or duplicate %}
<br>
<button type="reset" class="btn btn-link" onclick="
{%if duplicate%}
{% url 'asset_detail' previous_asset_id %}
{%else%}
history.back(){%endif%}">Cancel</button>
{% endif %}

6
assets/templates/partials/asset_list_table.html
View File

@@ -18,10 +18,10 @@
<td class="assetStatus">{{ item.status }}</td> <td class="assetStatus">{{ item.status }}</td>
<td class="d-none d-sm-table-cell"> <td class="d-none d-sm-table-cell">
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a type="button" class="btn btn-primary btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="fas fa-eye fa-fw"></i><span class="d-none d-sm-inline"> View</span></a> <a type="button" class="btn btn-primary btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="fas fa-eye"></i><span class="d-none d-sm-inline"> View</span></a>
{% if perms.assets.change_asset %} {% if perms.assets.change_asset %}
<a type="button" class="btn btn-warning btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="fas fa-edit fa-fw"></i><span class="d-none d-sm-inline"> Edit</span></a> <a type="button" class="btn btn-warning btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="fas fa-edit"></i><span class="d-none d-sm-inline"> Edit</span></a>
<a type="button" class="btn btn-secondary btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="fas fa-clone fa-fw"></i><span class="d-none d-sm-inline"> Duplicate</span></a> <a type="button" class="btn btn-info btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="fas fa-clone"></i><span class="d-none d-sm-inline"> Duplicate</span></a>
{% endif %} {% endif %}
</div> </div>
</td> </td>

4
assets/templates/partials/purchasedetails_form.html
View File

@@ -17,7 +17,7 @@
<div class="form-group"> <div class="form-group">
<label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label> <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon">£</span> <div class="input-group-prepend"><span class="input-group-text">£</span></div>
{% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %} {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
</div> </div>
</div> </div>
@@ -25,7 +25,7 @@
<div class="form-group"> <div class="form-group">
<label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label> <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon">£</span> <div class="input-group-prepend"><span class="input-group-text">£</span></div>
{% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %} {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
</div> </div>
</div> </div>