arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-07 23:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Show purchase and collection details side by side

Browse Source 
Not sure if I like this or not. Maybe collection should start collapsed, too.
This commit is contained in:
FreneticScribbler
2019-10-02 19:38:05 +01:00
parent 3d7fc18fb7
commit e591ebe05a
2 changed files with 192 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
assets/templates/asset_update.html
View File

@@ -17,18 +17,21 @@
{% else %} {% else %}
Asset: {{ object.asset_id }} {{ object.description }} Asset: {{ object.asset_id }} {{ object.description }}
{% endif %} {% endif %}
</h1> </h1>
</div> </div>
<div class="pull-right" style="margin-bottom: 100px"> <div class="row" style="padding-bottom: 1em">
<div class="col-sm-12">
<div class="pull-right">
{% include 'partials/asset_buttons.html' %} {% include 'partials/asset_buttons.html' %}
</div>
</div>
</div> </div>
<form method="post" id="asset_update_form"> <form method="post" id="asset_update_form">
{% 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="col-sm-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Asset Details Asset Details
@@ -40,7 +43,7 @@
{% if duplicate %} {% if duplicate %}
{% render_field form.asset_id|add_class:'form-control' value=object.asset_id %} {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
{% elif object.asset_id %} {% elif object.asset_id %}
{% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input form-control' value=object.asset_id %} {% render_field form.asset_id|attr:'readonly disabled'|add_class:'disabled_input form-control' value=object.asset_id %}
{% else %} {% else %}
{% render_field form.asset_id|add_class:'form-control' %} {% render_field form.asset_id|add_class:'form-control' %}
{% endif %} {% endif %}
@@ -99,7 +102,10 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Purchase Details Purchase Details
@@ -137,17 +143,16 @@
<label for="{{ form.date_acquired.id_for_label }}" >Date <label for="{{ form.date_acquired.id_for_label }}" >Date
Acquired</label> Acquired</label>
{% if object.date_acquired %} {% if object.date_acquired %}
{% render_field form.date_acquired|add_class:'datepicker form-control' value=object.date_acquired|date %} {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=object.date_acquired|date %}
{% else %} {% else %}
<input type="text" name="date_acquired" value="{% now "DATE_FORMAT" %}" <input type="date" name="date_acquired" value="{% now "DATE_FORMAT" %}"
class="datepicker form-control" id="id_date_acquired"> class="form-control" id="id_date_acquired">
{% endif %} {% endif %}
</div> </div>
<!---TODO: Presumably, this should only appear if the asset is in the sold category?--->
<div class="form-group"> <div class="form-group">
<label for="{{ form.date_sold.id_for_label }}">Date Sold</label> <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
{% render_field form.date_sold|add_class:'datepicker form-control' value=object.date_sold|date %} {% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=object.date_sold|date %}
</div> </div>
{% else %} {% else %}
<dl> <dl>
@@ -162,14 +167,16 @@
<dt>Date Acquired</dt> <dt>Date Acquired</dt>
<dd>{{ object.date_acquired|default_if_none:'-' }}</dd> <dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
{% if object.date_sold %}
<dt>Date Sold</dt> <dt>Date Sold</dt>
<dd>{{ object.date_sold|default_if_none:'-' }}</dd> <dd>{{ object.date_sold|default_if_none:'-' }}</dd>
{% endif %}
</dl> </dl>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
<div class="col-md-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Collection Details Collection Details
@@ -233,9 +240,15 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
</div>
</form> </form>
{% include 'partials/asset_buttons.html' %} <div class="row">
<div class="col-md-12">
{% include 'partials/asset_buttons.html' %}
</div>
</div>
{% include 'partials/confirm_delete.html' with object=object %} {% include 'partials/confirm_delete.html' with object=object %}

1
assets/templates/partials/render_field.html
View File

@@ -1,5 +1,6 @@
{% load widget_tweaks %} {% load widget_tweaks %}
<!---TODO: Assign form-control class in here--->
<div class="form-group"> <div class="form-group">
<label for="{{ field.id_for_label }}">{{ label|default:field.label }}</label> <label for="{{ field.id_for_label }}">{{ label|default:field.label }}</label>
{% if css %} {% if css %}