diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html index 61a12e20..1e58c720 100644 --- a/assets/templates/asset_create.html +++ b/assets/templates/asset_create.html @@ -17,9 +17,9 @@ {% if duplicate %}
-{% else %} - -{% endif %} + {% else %} + + {% endif %} {% include 'form_errors.html' %}
@@ -32,200 +32,40 @@
-
-
- Asset Details -
-
-
- - {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %} -
-
- - {% render_field form.description|add_class:'form-control' value=object.description %} -
-
- - -
- {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %} -
- - -
-
- - {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %} -
- -
- - {% render_field form.comments|add_class:'form-control' %} -
-
-
+ {% include 'partials/asset_form.html' %}
-
-
- Purchase Details -
-
-
- - -
- -
- -
- £ - {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %} -
-
- -
- -
- £ - {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %} -
-
- -
- - {% if object.date_acquired%} - {% with date_acq=object.date_acquired|date:"Y-m-d" %} - {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %} - {% endwith %} - {% else %} - - {% endif %} -
- -
- - {% 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 %} - {% endwith %} -
-
-
-
- {#% if object.is_cable and object.category == "Power" %#} - -
-
-
- Collection Details -
-
-
- - {% include 'partials/asset_picker.html' %} -
-
-
-
+ {% include 'partials/purchasedetails_form.html' %}
-
-
- {% include 'partials/asset_buttons.html' %} -
+ +
+ {% include 'partials/parent_form.html' %} +
+
+
+
+ {% include 'partials/asset_buttons.html' %} +
+
{% include 'partials/confirm_delete.html' with object=object %} {% endblock %} -{% block js%} - -{%endblock%} + checkIfCableHidden(); + + {%endblock%} diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html index 286c740e..90e264e9 100644 --- a/assets/templates/asset_update.html +++ b/assets/templates/asset_update.html @@ -10,231 +10,58 @@

{% if edit and object %} Edit Asset: {{ object.asset_id }} - {{ object.description }} - {% elif duplicate %} - Duplication of Asset: {{ previous_asset_id }} - {% elif not object %} - Create Asset {% else %} Asset: {{ object.asset_id }} - {{ object.description }} {% endif %}

-{% if create %} -
-{% else %} -{% endif %} -{% include 'form_errors.html' %} -
-
-
- {% include 'partials/asset_buttons.html' %} + {% include 'form_errors.html' %} +
+
+
+ {% include 'partials/asset_buttons.html' %} +
-
{% csrf_token %}
-
-
- Asset Details -
-
- {% if edit or duplicate %} -
- - {% if duplicate %} - {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %} - {% elif object.asset_id %} - {% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input form-control' value=object.asset_id %} - {% else %} - {% render_field form.asset_id|add_class:'form-control' %} - {% endif %} -
-
- - {% render_field form.description|add_class:'form-control' value=object.description %} -
-
- - -
-
- - -
-
- - {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %} -
- -
- - {% render_field form.comments|add_class:'form-control' %} -
- {% else %} -
Asset ID
-
{{ object.asset_id }}
- -
Description
-
{{ object.description }}
- -
Category
-
{{ object.category }}
- -
Status
-
{{ object.status }}
- -
Serial Number
-
{{ object.serial_number|default:'-' }}
- -
Comments
-
{{ object.comments|default:'-'|linebreaksbr }}
- {% endif %} -
-
+ {% include 'partials/asset_form.html' %}
-
-
- Purchase Details -
-
- {% if edit or duplicate %} -
- - -
- -
- -
- £ - {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %} -
-
- -
- -
- £ - {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %} -
-
- -
- - {% if object.date_acquired %} - {% with date_acq=object.date_acquired|date:"Y-m-d" %} - {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %} - {% endwith %} - {% else %} - - {% endif %} -
- -
- - {% with date_sol=object.date_sold|date:"Y-m-d" %} - {% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=date_sol %} - {% endwith %} -
- {% else %} -
-
Purchased From
-
{{ object.purchased_from|default_if_none:'-' }}
- -
Purchase Price
-
£{{ object.purchase_price|default_if_none:'-' }}
- -
Salvage Value
-
£{{ object.salvage_value|default_if_none:'-' }}
- -
Date Acquired
-
{{ object.date_acquired|default_if_none:'-' }}
- {% if object.date_sold %} -
Date Sold
-
{{ object.date_sold|default_if_none:'-' }}
- {% endif %} -
- {% endif %} -
-
-
-
-
-
- Collection Details -
-
- {% if edit or duplicate %} -
- - {% include 'partials/asset_picker.html' %} -
- {% else%} -
-
Parent
-
- {% if object.parent %} - - {{ object.parent.asset_id }} - {{ object.parent.description }} - - {% else %} - - - {% endif %} -
- -
Children
- {% if object.asset_parent.all %} - {% for child in object.asset_parent.all %} -
- - {{ child.asset_id }} - {{ child.description }} - -
- {% endfor %} - {% else %} -
-
- {% endif %} -
- {% endif %} -
-
-
-
-
-
- {% include 'partials/asset_buttons.html' %} -
+ {% include 'partials/purchasedetails_form.html' %}
+ +
+ {% include 'partials/parent_form.html' %} +
+
+
+
+ {% include 'partials/asset_buttons.html' %} +
+
- - {% include 'partials/confirm_delete.html' with object=object %} {% endblock %} + +{% block js%} + +{%endblock%} diff --git a/assets/templates/partials/asset_form.html b/assets/templates/partials/asset_form.html new file mode 100644 index 00000000..c4b17ed1 --- /dev/null +++ b/assets/templates/partials/asset_form.html @@ -0,0 +1,75 @@ +{% load widget_tweaks %} +{% load asset_templatetags %} +
+
+ Asset Details +
+
+ {% if edit or duplicate %} +
+ + {% if duplicate %} + {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %} + {% elif object.asset_id %} + {% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input form-control' value=object.asset_id %} + {% else %} + {% render_field form.asset_id|add_class:'form-control' %} + {% endif %} +
+
+ + {% render_field form.description|add_class:'form-control' value=object.description %} +
+
+ + +
+ {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %} +
+ + +
+
+ + {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %} +
+ +
+ + {% render_field form.comments|add_class:'form-control' %} +
+ {% else %} +
Asset ID
+
{{ object.asset_id }}
+ +
Description
+
{{ object.description }}
+ +
Category
+
{{ object.category }}
+ +
Status
+
{{ object.status }}
+ +
Serial Number
+
{{ object.serial_number|default:'-' }}
+ +
Comments
+
{{ object.comments|default:'-'|linebreaksbr }}
+ {% endif %} +
+
diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html new file mode 100644 index 00000000..3d64fe42 --- /dev/null +++ b/assets/templates/partials/cable_form.html @@ -0,0 +1,75 @@ +{% load widget_tweaks %} +{% load asset_templatetags %} +
+
+ Cable Details +
+
+ {% if edit or duplicate %} +
+ + +
+
+ + +
+
+ +
+ {% render_field form.length|add_class:'form-control' %} + {{ form.length.help_text }} +
+
+
+ +
+ {% render_field form.csa|add_class:'form-control' value=object.csa %} + {{ form.csa.help_text }} +
+
+
+ + {% render_field form.circuits|add_class:'form-control' value=object.circuits %} +
+
+ + {% render_field form.cores|add_class:'form-control' value=object.cores %} +
+ {% else %} +
+
Socket
+
{{ object.socket|default_if_none:'-' }}
+ +
Plug
+
{{ object.plug|default_if_none:'-' }}
+ +
Length
+
{{ object.length|default_if_none:'-' }}m
+ +
Cross Sectional Area
+
{{ object.csa|default_if_none:'-' }}m^2
+ +
Circuits
+
{{ object.circuits|default_if_none:'-' }}
+ +
Cores
+
{{ object.cores|default_if_none:'-' }}
+
+ {% endif %} +
+
diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html new file mode 100644 index 00000000..c5853c41 --- /dev/null +++ b/assets/templates/partials/parent_form.html @@ -0,0 +1,41 @@ +{% load widget_tweaks %} +{% load asset_templatetags %} +
+
+ Collection Details +
+
+ {% if edit or duplicate %} +
+ + {% include 'partials/asset_picker.html' %} +
+ {% else %} +
+
Parent
+
+ {% if object.parent %} + + {{ object.parent.asset_id }} - {{ object.parent.description }} + + {% else %} + - + {% endif %} +
+ +
Children
+ {% if object.asset_parent.all %} + {% for child in object.asset_parent.all %} +
+ + {{ child.asset_id }} - {{ child.description }} + +
+ {% endfor %} + {% else %} +
-
+ {% endif %} +
+ {% endif%} +
+
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html new file mode 100644 index 00000000..477b9e04 --- /dev/null +++ b/assets/templates/partials/purchasedetails_form.html @@ -0,0 +1,76 @@ +{% load widget_tweaks %} +{% load asset_templatetags %} +
+
+ Purchase Details +
+
+ {% if edit or duplicate %} +
+ + +
+ +
+ +
+ £ + {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %} +
+
+ +
+ +
+ £ + {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %} +
+
+ +
+ + {% if object.date_acquired%} + {% with date_acq=object.date_acquired|date:"Y-m-d" %} + {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %} + {% endwith %} + {% else %} + + {% endif %} +
+ +
+ + {% 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 %} + {% endwith %} +
+ {% else %} +
+
Purchased From
+
{{ object.purchased_from|default_if_none:'-' }}
+ +
Purchase Price
+
£{{ object.purchase_price|default_if_none:'-' }}
+ +
Salvage Value
+
£{{ object.salvage_value|default_if_none:'-' }}
+ +
Date Acquired
+
{{ object.date_acquired|default_if_none:'-' }}
+ {% if object.date_sold %} +
Date Sold
+
{{ object.date_sold|default_if_none:'-' }}
+ {% endif %} +
+ {% endif %} +
+