diff --git a/models.py b/models.py index a820baf7..8a341f54 100644 --- a/models.py +++ b/models.py @@ -8,6 +8,7 @@ class AssetCategory(models.Model): class Meta: verbose_name = 'Asset Category' verbose_name_plural = 'Asset Categories' + name = models.CharField(max_length=80) def __str__(self): @@ -18,6 +19,7 @@ class AssetStatus(models.Model): class Meta: verbose_name = 'Asset Status' verbose_name_plural = 'Asset Statuses' + name = models.CharField(max_length=80) def __str__(self): diff --git a/templates/asset_list_table_body.html b/templates/asset_list_table_body.html index 289762e1..cbcb3749 100644 --- a/templates/asset_list_table_body.html +++ b/templates/asset_list_table_body.html @@ -8,6 +8,7 @@ visibility edit + content_copy {% endfor %} \ No newline at end of file diff --git a/templates/asset_update.html b/templates/asset_update.html index fd0d6bf8..b10bc7fb 100644 --- a/templates/asset_update.html +++ b/templates/asset_update.html @@ -8,8 +8,10 @@

Asset - {% if object %} + {% if object.id %} | {{ object.asset_id }} + {% elif duplicate %} + Duplication of {{ object.asset_id }} {% else %} Create {% endif %} @@ -19,246 +21,264 @@
- {% csrf_token %} - + {% csrf_token %} + -
-
-
- {% if edit %} -{# #} - - {% else %} - Edit - {% endif %} - {% if object %} - Delete - {% endif %} -
-
-
- -
-
-
- Asset Details -
-
-
+
+
+
{% if edit %} -
-
- {% if object.asset_id %} - {% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input' value=object.asset_id %} - {% else %} - {% render_field form.asset_id %} - {% endif %} - -
- -
- {% render_field form.description value=object.description %} - -
- -
- - -
- -
- - -
- -
- {% render_field form.serial_number value=object.serial_number %} - -
- -
- {% render_field form.comments|add_class:'materialize-textarea' %} - -
- -
+ {# #} + + Duplicate + {% elif duplicate %} + + Cancel {% 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 }}
+ Edit + Duplicate {% endif %} -
+ {% if object and not duplicate %} + Delete + {% endif %} +
- -
-
-
- Purchase Details -
-
-
- {% if edit %} -
-
- - -
- -
- {% render_field form.purchase_price value=object.purchase_price %} - -
- -
- {% render_field form.salvage_value value=object.salvage_value %} - -
- -
- {% render_field form.date_acquired|add_class:'datepicker' value=object.date_acquired|date %} - -
- -
- {% render_field form.date_sold|add_class:'datepicker' value=object.date_sold|date %} - -
-
- {% 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:'-' }}
- -
Date Sold
-
{{ object.date_sold|default_if_none:'-' }}
- {% endif %} -
-
-
-
- - {% if object.is_cable %}
- Cable Details + Asset Details
-
Length
-
{{ object.length }}m
+ {% if edit or duplicate %} +
+
+ {% if duplicate %} + {% render_field form.asset_id value=object.asset_id %} + {% elif object.asset_id %} + {% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input' value=object.asset_id %} + {% else %} + {% render_field form.asset_id %} + {% endif %} + +
-
Type
-
TODO
+
+ {% render_field form.description value=object.description %} + +
-
Required CSA
-
TODO
+
+ + +
+ +
+ + +
+ +
+ {% render_field form.serial_number value=object.serial_number %} + +
+ +
+ {% render_field form.comments|add_class:'materialize-textarea' %} + +
+ +
+ {% 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 %}
- {% endif %} -
-
-
- Collection Details -
-
-
- {% if edit %} -
+
+
+
+ Purchase Details +
+
+
+ {% if edit or duplicate %} +
+
+ + +
-
- - - -
-
- -
-
- - -{# {% render_field form.parent value=object.parent %}#} -
-
- -
-
-
- -
-
- {% else %} -
Parent
-
- {% if object.parent %} - - {{ object.parent.asset_id }} - {{ object.parent.description }} - - {% else %} - - - {% endif %} -
+
+ {% render_field form.purchase_price value=object.purchase_price %} + +
-
Children
- {% if object.asset_parent.all %} - {% for child in object.asset_parent.all %} -
- - {{ child.asset_id }} - {{ child.description }} - -
- {% endfor %} +
+ {% render_field form.salvage_value value=object.salvage_value %} + +
+ +
+ {% render_field form.date_acquired|add_class:'datepicker' value=object.date_acquired|date %} + +
+ +
+ {% render_field form.date_sold|add_class:'datepicker' value=object.date_sold|date %} + +
+
{% 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:'-' }}
+ +
Date Sold
+
{{ object.date_sold|default_if_none:'-' }}
{% endif %} - {% endif %} -
+ +
+
+
+ + {% if object.is_cable %} +
+
+
+ Cable Details +
+
+
+
Length
+
{{ object.length }}m
+ +
Type
+
TODO
+ +
Required CSA
+
TODO
+
+
+
+
+ {% endif %} + +
+
+
+ Collection Details +
+
+
+ {% if edit or duplicate %} +
+ +
+ + + +
+
+ +
+
+ + + {# {% render_field form.parent value=object.parent %}#} +
+
+ +
+
+
+ +
+
+ {% 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 'confirm_delete.html' with object=object %} @@ -267,14 +287,14 @@ {% block script %} -{# #} + {# #}