arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-16 21:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Modify audit exclusions to properly prevent data loss

Browse Source
This commit is contained in:
FreneticScribbler
2020-04-14 20:45:24 +01:00
parent c291a211b0
commit e78a474290
3 changed files with 11 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/forms.py
View File

@@ -21,11 +21,11 @@ class AssetForm(forms.ModelForm):
self.fields['date_acquired'].widget.format = '%Y-%m-%d'
# Needed to prevent assets losing parent data on audit
class AssetAuditForm(AssetForm):
class Meta(AssetForm.Meta):
# TODO Inherit exlcusions from superclass
exclude = ['asset_id_prefix', 'asset_id_number', 'last_audited_at', 'last_audited_by', 'parent']
# Prevents assets losing existing data that isn't included in the audit form
exclude = ['asset_id_prefix', 'asset_id_number', 'last_audited_at', 'last_audited_by',
'parent', 'purchased_from', 'purchase_price', 'comments']
class AssetSearchForm(forms.Form):

29
assets/templates/asset_audit.html
View File

@@ -69,7 +69,12 @@
<btn class="btn btn-default" onclick="setAcquired(true);" tabindex="-1">Today</btn>
<btn class="btn btn-default" onclick="setAcquired(false);" tabindex="-1">Unknown</btn>
</div>
<!--- TODO Add buttons for 'today' and 'unknown' (sets to beginning of time)--->
</div>
<div class="form-group">
<label for="{{ form.date_sold.id_for_label }}" class="col-sm-2 control-label">Date Sold</label>
<div class="col-sm-6">
{% render_field form.date_sold|add_class:'form-control' value=object.date_sold %}
</div>
</div>
<div class="form-group">
<label for="{{ form.salvage_value.id_for_label }}" class="col-sm-2 control-label">Salvage Value</label>
@@ -89,15 +94,9 @@
</div>
<div id="cable-table">
<div class="form-group">
<label for="{{ form.plug.id_for_label }}" class="col-sm-2 control-label">Plug</label>
<label for="{{ form.cable_type.id_for_label }}" class="col-sm-2 control-label">Cable Type</label>
<div class="col-sm-10">
{% render_field form.plug|add_class:'form-control'%}
</div>
</div>
<div class="form-group">
<label for="{{ form.socket.id_for_label }}" class="col-sm-2 control-label">Socket</label>
<div class="col-sm-10">
{% render_field form.socket|add_class:'form-control'%}
{% render_field form.cable_type|add_class:'form-control' %}
</div>
</div>
<div class="form-group">
@@ -127,18 +126,6 @@
<btn class="btn btn-default" onclick="setCSA('2.5');" tabindex="-1">2.5{{ form.csa.help_text }}</btn>
</div>
</div>
<div class="form-group">
<label for="{{ form.circuits.id_for_label }}" class="col-sm-2 control-label">Circuits</label>
<div class="col-sm-10">
{% render_field form.circuits|add_class:'form-control' value=object.circuits %}
</div>
</div>
<div class="form-group">
<label for="{{ form.cores.id_for_label }}" class="col-sm-2 control-label">Cores</label>
<div class="col-sm-10">
{% render_field form.cores|add_class:'form-control' value=object.cores %}
</div>
</div>
</div>
{% if not request.is_ajax %}
<div class="form-group pull-right">

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

@@ -1,50 +0,0 @@
{% load widget_tweaks %}
<div id="cable-table">
<div class="form-group">
<label for="{{ form.plug.id_for_label }}" class="col-sm-2 control-label">Plug</label>
<div class="col-sm-10">
{% render_field form.plug|add_class:'form-control'%}
</div>
</div>
<div class="form-group">
<label for="{{ form.socket.id_for_label }}" class="col-sm-2 control-label">Socket</label>
<div class="col-sm-10">
{% render_field form.socket|add_class:'form-control'%}
</div>
</div>
<div class="form-group">
<label for="{{ form.length.id_for_label }}" class="col-sm-2 control-label">Length</label>
<div class="col-sm-6">
<div class="input-group">
{% render_field form.length|add_class:'form-control' %}
<span class="input-group-addon">{{ form.length.help_text }}</span>
</div>
</div>
<div class="col-sm-4">
<btn class="btn btn-danger btn-xs" onclick="setLength('5');">5m</btn>
<btn class="btn btn-success btn-xs" onclick="setLength('10');">10m</btn>
<btn class="btn btn-info btn-xs" onclick="setLength('20');">20m</btn>
</div>
</div>
<div class="form-group">
<label for="{{ form.csa.id_for_label }}" class="col-sm-2 control-label">Cross Sectional Area</label>
<div class="col-sm-10">
<div class="input-group">
{% render_field form.csa|add_class:'form-control' value=object.csa %}
<span class="input-group-addon">{{ form.csa.help_text }}</span>
</div>
</div>
</div>
<div class="form-group">
<label for="{{ form.circuits.id_for_label }}" class="col-sm-2 control-label">Circuits</label>
<div class="col-sm-10">
{% render_field form.circuits|add_class:'form-control' value=object.circuits %}
</div>
</div>
<div class="form-group">
<label for="{{ form.cores.id_for_label }}" class="col-sm-2 control-label">Cores</label>
<div class="col-sm-10">
{% render_field form.cores|add_class:'form-control' value=object.cores %}
</div>
</div>
</div>