From 769137fabd25f038f924b56771ee129bf7b1425f Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 01:44:54 +0100
Subject: [PATCH 01/29] Started work on improving asset form update and
 validation - requires de-spaghettifying of asset_update.html before
 continuing

---
 assets/forms.py                              |  9 ++
 assets/templates/asset_update.html           | 89 +++++---------------
 assets/templates/partials/asset_buttons.html |  8 +-
 assets/urls.py                               |  2 +-
 assets/views.py                              | 17 +++-
 5 files changed, 50 insertions(+), 75 deletions(-)

diff --git a/assets/forms.py b/assets/forms.py
index c727a9d1..a7d4d052 100644
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -1,4 +1,5 @@
 from django import forms
+from django.core.exceptions import ValidationError
 
 from assets import models
 
@@ -7,7 +8,15 @@ class AssetForm(forms.ModelForm):
     class Meta:
         model = models.Asset
         fields = '__all__'
+    
+    def __init__(self, *args, **kwargs): 
+        super(AssetForm, self).__init__(*args, **kwargs)                       
+        self.fields['asset_id'].disabled = True #You should not be able to change the asset ID, either in update or create
 
+    def clean_date_sold(self):
+        if self.cleaned_data["date_sold"] and self.cleaned_data["date_acquired"] > self.cleaned_data["date_sold"]:
+            raise ValidationError("Cannot sell an item before it is acquired")
+        return self.cleaned_data["date_sold"]
 
 class SupplierForm(forms.ModelForm):
     class Meta:
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 6c3de1e0..3b906aad 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -19,7 +19,11 @@
       {% endif %}
   </h1>
 </div>
-
+{% if create %}
+<form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
+{% else %}
+<form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.pk%}">
+{% endif %}
 <div class="row" style="padding-bottom: 1em">
   <div class="col-sm-12">
     <div class="pull-right">
@@ -27,7 +31,6 @@
     </div>
   </div>
 </div>
-<form method="post" id="asset_update_form">
   {% csrf_token %}
   <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
   <div class="row">
@@ -76,7 +79,7 @@
             <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
             {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
           </div>
-          <!---TODO: Lower default number of lines in comments box--->
+          <!---TODO: Lower default number of lines in comments box-->
           <div class="form-group">
             <label for="{{ form.comments.id_for_label }}">Comments</label>
             {% render_field form.comments|add_class:'form-control' %}
@@ -143,16 +146,20 @@
             <label for="{{ form.date_acquired.id_for_label }}" >Date
                                         Acquired</label>
             {% if object.date_acquired %}
-            {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=object.date_acquired|date %}
+              {% 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 %}
-            <input type="date" name="date_acquired" value="{% now "DATE_FORMAT" %}"
+            <input type="date" name="date_acquired" value="{% now "%Y-%m-%d%" %}"
                                                class="form-control" id="id_date_acquired">
                                     {% endif %}
             </div>
 
             <div class="form-group">
               <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
-              {% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=object.date_sold|date %}
+              {% 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 %}
             </div>
             {% else %}
             <dl>
@@ -242,71 +249,15 @@
           </div>
         </div>
       </div>
+    <div class="row">
+      <div class="col-md-12">
+        {% include 'partials/asset_buttons.html' %}
+      </div>
+    </div>
 </form>
 
-<div class="row">
-  <div class="col-md-12">
-    {% include 'partials/asset_buttons.html' %}
-  </div>
-</div>
+
 
 {% include 'partials/confirm_delete.html' with object=object %}
 
-{% endblock %}
-
-{% block js %}
-<script>
-  function updateAsset() {
-    $.ajax({
-      url: "{% url 'ajax_asset_update' %}", // the endpoint
-      type: "POST", // http method
-      data: {
-        form: $('#asset_update_form').serialize()
-      },
-      traditional: true,
-      headers: {
-        'X-CSRFToken': document.getElementById("asset_update_form").csrfmiddlewaretoken.value
-      },
-
-      success: function(data) {
-        // console.log(data);
-        window.location.href = data['url'];
-      },
-
-      error: function(xhr) {
-        console.log(xhr.status + ": " + xhr.responseText)
-      }
-    });
-  }
-</script>
-
-{#    <script>#}
-{#        $('#asset_update_form').on('submit', function(event){#}
-{#console.log($('#asset_update_form').serialize());#}
-{#            event.preventDefault();#}
-{#            updateAsset();#}
-{#            return false;#}
-{#        });#}
-{#    </script>#}
-
-<script>
-  function clearParent() {
-    $('#hidden_parent_id').val('');
-    $('#parent_id').val('');
-  }
-</script>
-
-<script>
-  $(document).ready(function() {
-    {
-      %
-      if edit or duplicate %
-    }
-    var comments_id = '#{{ form.comments.id_for_label }}';
-    $(comments_id).val('{{ object.comments|linebreaksn }}'); {
-      %
-      endif %
-    }
-  })
-</script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index d752e254..25eeac9c 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -1,16 +1,16 @@
 <div class="btn-group">
   {% if edit and object %}
   <!--edit-->
-  <button type="button" class="btn btn-success" onclick="updateAsset()"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
+  <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
   <a class="btn btn-default" href="{% url 'asset_update' object.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
   <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
   {% elif duplicate %}
   <!--duplicate-->
-  <button type="button" class="btn btn-default" onclick="updateAsset()"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
+  <button type="submit" class="btn btn-default"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
   <a href="{% url 'asset_detail' previous_asset_pk %}" class="btn btn-warning"><i class="glyphicon glyphicon-remove"></i> Cancel</a>
-  {% elif not object %}
+  {% elif create %}
   <!--create-->
-  <button type="button" class="btn btn-success" onclick="updateAsset()"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
+  <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
   {% else %}
   <!--detail view-->
   <a href="{% url 'asset_update' object.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
diff --git a/assets/urls.py b/assets/urls.py
index dcdf5569..900f4c33 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -10,7 +10,7 @@ urlpatterns = [
     path('', views.AssetList.as_view(), name='index'),
     path('asset/list/', views.AssetList.as_view(), name='asset_list'),
     path('asset/<int:pk>/', views.AssetDetail.as_view(), name='asset_detail'),
-    path('asset/create/', views.AssetEdit.as_view(), name='asset_create'),
+    path('asset/create/', views.AssetCreate.as_view(), name='asset_create'),
     path('asset/<int:pk>/edit/', views.AssetEdit.as_view(), name='asset_update'),
     path('asset/delete/', views.asset_delete, name='ajax_asset_delete'),
     path('asset/update/', views.asset_update, name='ajax_asset_update'),
diff --git a/assets/views.py b/assets/views.py
index 62402a95..037937f4 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -53,8 +53,10 @@ class AssetDetail(LoginRequiredMixin, generic.DetailView):
 #     template_name = 'asset_update.html'
 #     # success_url = reverse_lazy('asset_list')
 
-class AssetEdit(LoginRequiredMixin, generic.TemplateView):
+class AssetEdit(LoginRequiredMixin, generic.UpdateView):
     template_name = 'asset_update.html'
+    model = models.Asset
+    form_class = forms.AssetForm
 
     def get_context_data(self, **kwargs):
         context = super(AssetEdit, self).get_context_data(**kwargs)
@@ -75,6 +77,19 @@ class AssetEdit(LoginRequiredMixin, generic.TemplateView):
 
         return context
 
+    def get_success_url(self):
+        return reverse("asset_detail", kwargs={"pk":self.object.id})
+
+class AssetCreate(LoginRequiredMixin, generic.CreateView):
+    template_name = 'asset_update.html'
+    model = models.Asset
+    form_class = forms.AssetForm
+
+    def get_context_data(self, **kwargs):
+        context = super(AssetCreate, self).get_context_data(**kwargs)
+        context["create"] = True
+        return context
+
 @login_required()
 def asset_update(request):
     context = dict()

From a4adc8bc7b2fd4ee1c7951e0d502491e20251ea5 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 14:54:19 +0100
Subject: [PATCH 02/29] Now asset_ids are going to be editable, removed that
 limitation from form

---
 assets/forms.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/assets/forms.py b/assets/forms.py
index a7d4d052..d1a24ef0 100644
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -8,10 +8,6 @@ class AssetForm(forms.ModelForm):
     class Meta:
         model = models.Asset
         fields = '__all__'
-    
-    def __init__(self, *args, **kwargs): 
-        super(AssetForm, self).__init__(*args, **kwargs)                       
-        self.fields['asset_id'].disabled = True #You should not be able to change the asset ID, either in update or create
 
     def clean_date_sold(self):
         if self.cleaned_data["date_sold"] and self.cleaned_data["date_acquired"] > self.cleaned_data["date_sold"]:

From 3aa3498d3a19fe8a8ef96a366e86e3807046481f Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 14:59:15 +0100
Subject: [PATCH 03/29] Split out create and duplicate templates, got both
 working

---
 assets/templates/asset_create.html           | 187 +++++++++++++++++++
 assets/templates/partials/asset_buttons.html |   2 +-
 assets/urls.py                               |   2 +-
 assets/views.py                              |  70 +++----
 4 files changed, 215 insertions(+), 46 deletions(-)
 create mode 100644 assets/templates/asset_create.html

diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
new file mode 100644
index 00000000..640008e3
--- /dev/null
+++ b/assets/templates/asset_create.html
@@ -0,0 +1,187 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+{% load asset_templatetags %}
+{% block title %}Asset {{ object.asset_id }}{% endblock %}
+
+
+{% block content %}
+
+<div class="page-header">
+  <h1>
+      {% if duplicate %}
+          Duplication of Asset: {{ previous_asset_id }}
+      {% else %}
+          Create Asset
+      {% endif %}
+  </h1>
+</div>
+{% if duplicate %}
+<form method="post" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_pk%}">
+{% else %}
+<form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
+{% endif %}
+  <div class="row" style="padding-bottom: 1em">
+    <div class="col-sm-12">
+      <div class="pull-right">
+        {% include 'partials/asset_buttons.html' %}
+      </div>
+    </div>
+  </div>
+  {% csrf_token %}
+  <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-heading">
+          Asset Details
+        </div>
+        <div class="panel-body">
+          <div class="form-group"
+            <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
+            {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
+          </div>
+          <div class="form-group">
+            <label for="{{ form.description.id_for_label }}">Description</label>
+            {% render_field form.description|add_class:'form-control' value=object.description %}
+          </div>
+          <div class="form-group">
+            <label for="{{ form.category.id_for_label }}" >Category</label>
+            <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control">
+            {% for id, choice in form.category.field.choices %}
+              <option value="{{ id }}"
+                {% if object.category.id == id %}
+                  selected
+                {% endif %}>
+              {{ choice }}
+              </option>
+            {% endfor %}
+            </select>
+          </div>
+          <div class="form-group">
+            <label for="{{ form.status.id_for_label }}" >Status</label>
+            <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
+              {% for id, choice in form.status.field.choices %}
+                <option value="{{ id }}"
+                  {% if not object.status.id and choice == "Active" or object.status.id == id %}selected{% endif %}>{{ choice }}</option>
+              {% endfor %}
+            </select>
+          </div>
+          <div class="form-group">
+            <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
+              {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
+          </div>
+          <!---TODO: Lower default number of lines in comments box-->
+          <div class="form-group">
+            <label for="{{ form.comments.id_for_label }}">Comments</label>
+              {% render_field form.comments|add_class:'form-control' %}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          Purchase Details
+        </div>
+        <div class="panel-body">
+          <div class="form-group">
+            <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
+            <select class="form-control" name="{{ form.purchased_from.name }}" id="{{ form.purchased_from.id_for_label }}">
+              {% for id, choice in form.purchased_from.field.choices %}
+                <option value="{{ id }}"
+                {% if object.purchased_from.id == id %}
+                  selected
+                {% endif %}>
+                {{ choice }}</option>
+              {% endfor %}
+            </select>
+          </div>
+
+          <div class="form-group">
+            <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
+            <div class="input-group">
+              <span class="input-group-addon">£</span>
+              {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
+            <div class="input-group">
+              <span class="input-group-addon">£</span>
+              {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
+              {% 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 %}
+                <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
+                  class="form-control" id="id_date_acquired">
+              {% endif %}
+            </div>
+
+            <div class="form-group">
+              <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
+              {% 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 %}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-md-6">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            Collection Details
+          </div>
+          <div class="panel-body">
+            <div class="form-group">
+              <label for="parent_id">Parent</label>
+              <input type="hidden" name="{{ form.parent.html_name }}" id="hidden_parent_id" value="{{ object.parent.id }}">
+              <div class="input-group">
+                <input type="text" id="parent_id" value="{{ object.parent|default:'' }}" disabled="" class="form-control">
+                <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" onclick="clearParent()">Clear</button>
+                </span>
+              </div>
+            </div>
+
+            <div class="form-group">
+              <label for="parent_search">Search for asset</label>
+              <div class="input-group">
+                <input type="text" id="parent_search" class="form-control">
+                <span class="input-group-btn">
+                  <button type="button" class="btn btn-default" onclick="formAssetSearch()">
+                    <i class="glyphicon glyphicon-search"></i> Search
+                  </button>
+                </span>
+              </div>
+            </div>
+            <div class="col s2">
+              <br>
+            </div>
+            <div class="col s12" id="formAssetSearchResult">
+              <!--Placeholder for search results-->
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          {% include 'partials/asset_buttons.html' %}
+        </div>
+      </div>
+    </div>
+  </div>
+</form>
+
+{% include 'partials/confirm_delete.html' with object=object %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index 25eeac9c..606a9bd7 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -14,7 +14,7 @@
   {% else %}
   <!--detail view-->
   <a href="{% url 'asset_update' object.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-  <a class="btn btn-default" href="{% url 'asset_update' object.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+  <a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
   <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
   {% endif %}
 </div>
diff --git a/assets/urls.py b/assets/urls.py
index 900f4c33..5970d64b 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -12,8 +12,8 @@ urlpatterns = [
     path('asset/<int:pk>/', views.AssetDetail.as_view(), name='asset_detail'),
     path('asset/create/', views.AssetCreate.as_view(), name='asset_create'),
     path('asset/<int:pk>/edit/', views.AssetEdit.as_view(), name='asset_update'),
+    path('asset/<int:pk>/duplicate/', views.AssetDuplicate.as_view(), name='asset_duplicate'),
     path('asset/delete/', views.asset_delete, name='ajax_asset_delete'),
-    path('asset/update/', views.asset_update, name='ajax_asset_update'),
 
     path('supplier/list', views.SupplierList.as_view(), name='supplier_list'),
     path('supplier/<int:pk>', views.SupplierDetail.as_view(), name='supplier_detail'),
diff --git a/assets/views.py b/assets/views.py
index 037937f4..ff2d0a22 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -65,67 +65,49 @@ class AssetEdit(LoginRequiredMixin, generic.UpdateView):
         context['form'] = forms.AssetForm
         # context['asset_names'] = models.Asset.objects.values_list('asset_id', 'description').order_by('-date_acquired')[]
 
-        if self.request.GET.get('duplicate'):
-            context['duplicate'] = True
-            context['previous_asset_id'] = context['object'].asset_id
-            context['previous_asset_pk'] = context['object'].pk
-            context['object'].pk = 0
-            context['object'].asset_id = ''
-            context['object'].serial_number = ''
-        else:
-            context['edit'] = True
+        context['edit'] = True
 
         return context
 
+    def form_invalid(self, form):
+        print(form.errors)
+        return super().form_invalid(form)
+
     def get_success_url(self):
         return reverse("asset_detail", kwargs={"pk":self.object.id})
 
 class AssetCreate(LoginRequiredMixin, generic.CreateView):
-    template_name = 'asset_update.html'
+    template_name = 'asset_create.html'
     model = models.Asset
     form_class = forms.AssetForm
 
     def get_context_data(self, **kwargs):
         context = super(AssetCreate, self).get_context_data(**kwargs)
+        
         context["create"] = True
         return context
+    
+    def get_success_url(self):
+        return reverse("asset_detail", kwargs={"pk":self.object.id})
 
-@login_required()
-def asset_update(request):
-    context = dict()
+class DuplicateMixin:
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        self.object.pk = None
+        return self.render_to_response(self.get_context_data())
 
-    if request.method == 'POST' and request.is_ajax():
-        defaults = QueryDict(request.POST['form'].encode('ASCII')).dict()
-        defaults.pop('csrfmiddlewaretoken')
-
-        asset_pk = int(defaults.pop('id'))
-
-        if defaults['date_acquired']:
-            defaults['date_acquired'] = parser.parse(defaults.pop('date_acquired'))
-        else:
-            defaults['date_acquired'] = None
-
-        if defaults['date_sold']:
-            defaults['date_sold'] = parser.parse(defaults.pop('date_sold'))
-        else:
-            defaults['date_sold'] = None
-
-        # if defaults['parent']:
-        #     defaults['parent'] = models.Asset.objects.get(asset_id=defaults.pop('parent'))
-
-        form = forms.AssetForm(defaults)
-        context['valid'] = form.is_valid()
-        context['errors'] = form.errors.as_json()
-
-        if asset_pk == 0:
-            asset = models.Asset.objects.create(**form.cleaned_data)
-        else:
-            asset, created = models.Asset.objects.update_or_create(pk=asset_pk, defaults=form.cleaned_data)
-
-        context['url'] = reverse('asset_detail', args=[asset.pk])
-
-        return HttpResponse(json.dumps(context), content_type='application/json')
+class AssetDuplicate(DuplicateMixin, AssetCreate):
+    template_name = 'asset_create.html'
+    model = models.Asset
+    form_class = forms.AssetForm
 
+    def get_context_data(self, **kwargs):
+        context = super(AssetCreate, self).get_context_data(**kwargs)
+        context["create"] = None
+        context["duplicate"] = True
+        context['previous_asset_id'] = self.get_object().asset_id
+        context["previous_asset_pk"] = pk = self.kwargs.get(self.pk_url_kwarg)
+        return context
 
 @login_required()
 def asset_delete(request):

From 1d253aa45272984f5a78aa03486c8385d00a62d4 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 15:07:41 +0100
Subject: [PATCH 04/29] Fixed edit always being invalid due to always failing
 form validation

---
 assets/templates/asset_update.html | 2 +-
 assets/views.py                    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 3b906aad..1a976646 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -46,7 +46,7 @@
             {% 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 disabled'|add_class:'disabled_input form-control' value=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 %}
diff --git a/assets/views.py b/assets/views.py
index ff2d0a22..064ccfc1 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -60,8 +60,6 @@ class AssetEdit(LoginRequiredMixin, generic.UpdateView):
 
     def get_context_data(self, **kwargs):
         context = super(AssetEdit, self).get_context_data(**kwargs)
-        if self.kwargs:
-            context['object'] = get_object_or_404(models.Asset, pk=self.kwargs['pk'])
         context['form'] = forms.AssetForm
         # context['asset_names'] = models.Asset.objects.values_list('asset_id', 'description').order_by('-date_acquired')[]
 
@@ -70,7 +68,6 @@ class AssetEdit(LoginRequiredMixin, generic.UpdateView):
         return context
 
     def form_invalid(self, form):
-        print(form.errors)
         return super().form_invalid(form)
 
     def get_success_url(self):

From e3cbcbd1518e7ce51c0ab623f7ed9a35e5310d44 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 20:17:26 +0100
Subject: [PATCH 05/29] Fixed search and implemented an asset search api

Added asset picker for parent attribute

Co-authored-by: Panagiotis Petridis <lPanagiotisPetridisl@gmail.com>
---
 assets/templates/asset_create.html            | 32 +---------
 assets/templates/asset_list.html              | 20 +++---
 assets/templates/asset_update.html            | 32 +---------
 .../partials/asset_list_table_body.html       |  3 +-
 assets/templates/partials/asset_picker.html   | 63 +++++++++++++++++++
 assets/urls.py                                |  2 +
 assets/views.py                               | 38 +++++++----
 7 files changed, 109 insertions(+), 81 deletions(-)
 create mode 100644 assets/templates/partials/asset_picker.html

diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index 640008e3..4a908d79 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -20,6 +20,7 @@
 {% else %}
 <form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
 {% endif %}
+  {% include 'form_errors.html' %}
   <div class="row" style="padding-bottom: 1em">
     <div class="col-sm-12">
       <div class="pull-right">
@@ -142,35 +143,8 @@
             Collection Details
           </div>
           <div class="panel-body">
-            <div class="form-group">
-              <label for="parent_id">Parent</label>
-              <input type="hidden" name="{{ form.parent.html_name }}" id="hidden_parent_id" value="{{ object.parent.id }}">
-              <div class="input-group">
-                <input type="text" id="parent_id" value="{{ object.parent|default:'' }}" disabled="" class="form-control">
-                <span class="input-group-btn">
-                  <button type="button" class="btn btn-default" onclick="clearParent()">Clear</button>
-                </span>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <label for="parent_search">Search for asset</label>
-              <div class="input-group">
-                <input type="text" id="parent_search" class="form-control">
-                <span class="input-group-btn">
-                  <button type="button" class="btn btn-default" onclick="formAssetSearch()">
-                    <i class="glyphicon glyphicon-search"></i> Search
-                  </button>
-                </span>
-              </div>
-            </div>
-            <div class="col s2">
-              <br>
-            </div>
-            <div class="col s12" id="formAssetSearchResult">
-              <!--Placeholder for search results-->
-            </div>
-          </div>
+            {% include 'partials/asset_picker.html' %}
+          </div
         </div>
       </div>
       <div class="row">
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index a8a0da2a..3d1ed407 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -11,20 +11,20 @@
 <form id="asset-search-form">
   {% csrf_token %}
   <div class="input-group">
-    <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{searchName}}">
+    <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}">
     <label for="asset_id" class="sr-only">Asset ID/Description:</label>
     <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
   </div>
-</form>
-
-<form class="form-inline" id="asset-filter-form">
-  {% csrf_token %}
   <div class="form-group">
     <label for="cat">Category:</label>
     <select name="cat" class="form-control">
-          <option>None</option>
+          <option value="">None</option>
           {% for name in categories %}
+          {% if name == category_select %}
+          <option selected>
+          {% else %}
           <option>
+          {% endif %}
             {{ name }}
           </option>
           {% endfor %}
@@ -33,15 +33,19 @@
   <div class="form-group">
     <label for="status">Status:</label>
     <select name="status" class="form-control">
-    <option>None</option>
+    <option value="">None</option>
             {% for name in statuses %}
+            {% if name == status_select %}
+            <option selected>
+            {% else %}
             <option>
+            {% endif %}
               {{ name }}
             </option>
             {% endfor %}
     </select>
   </div>
-  <!---TODO: Auto filter whenever an option is selected, instead of using a button --->
+  <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
   <button type="submit" class="btn btn-default">Filter</button>
 </form>
 
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 1a976646..a3a228a0 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -24,6 +24,7 @@
 {% else %}
 <form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.pk%}">
 {% endif %}
+{% include 'form_errors.html' %}
 <div class="row" style="padding-bottom: 1em">
   <div class="col-sm-12">
     <div class="pull-right">
@@ -190,35 +191,8 @@
           </div>
           <div class="panel-body">
             {% if edit or duplicate %}
-            <div class="form-group">
-              <label for="parent_id">Parent</label>
-              <input type="hidden" name="{{ form.parent.html_name }}" id="hidden_parent_id"
-                                         value="{{ object.parent.id }}">
-              <div class="input-group">
-                <input type="text" id="parent_id" value="{{ object.parent|default:'' }}"
-                                           disabled="" class="form-control">
-                <span class="input-group-btn"><button type="button" class="btn btn-default" onclick="clearParent()">Clear
-         </button></span>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <label for="parent_search">Search for asset</label>
-              <div class="input-group">
-                <input type="text" id="parent_search" class="form-control">
-                <span class="input-group-btn"><button type="button" class="btn btn-default" onclick="formAssetSearch()">
-                                        <i class="glyphicon glyphicon-search"></i> Search
-                                    </button></span>
-              </div>
-            </div>
-            <div class="col s2">
-
-              <br>
-                                </div>
-              <div class="col s12" id="formAssetSearchResult">
-                <!--Placeholder for search results-->
-              </div>
-              {% else %}
+            {% include 'partials/asset_picker.html' %}
+            {% else%}
               <dl>
                 <dt>Parent</dt>
                 <dd>
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index 4972b993..db4a62a9 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -1,7 +1,6 @@
 {% for item in object_list %}
     {#                <li><a href="{% url 'asset_detail' item.pk %}">{{ item.asset_id }} - {{ item.description }}</a></li>#}
-    <!---TODO: When the ability to filter the list is added, remove the colours from the filter - specifically, stop greying out sold/binned stuff if it is being searched for--->
-    <tr class="
+    <!---TODO: When the ability to filter the list is added, remove the colours from the filter - specifically, stop greying out sold/binned stuff if it is being searched for-->    <tr class="
                 {% if item.status.name == 'Broken' %}
                   danger
                 {% elif item.status.name == 'Lost'%}
diff --git a/assets/templates/partials/asset_picker.html b/assets/templates/partials/asset_picker.html
new file mode 100644
index 00000000..444d95cd
--- /dev/null
+++ b/assets/templates/partials/asset_picker.html
@@ -0,0 +1,63 @@
+<select name="parent" id="parent_id" class="selectpicker">
+    {% if object.parent%}
+    <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
+    {% endif %}
+</select>
+
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+{% endblock %}
+
+{% block js %}
+<script>
+$('#parent_id')
+    .selectpicker({
+        liveSearch: true
+    })
+    .ajaxSelectPicker({
+        ajax: {
+            url: '{% url 'asset_search_json'%}',
+            type: "get",
+            data: function () {
+                var params = {
+                    {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
+                };
+                return params;
+            }
+        },
+        locale: {
+            emptyTitle: 'Search for item...'
+        },
+        preprocessData: function(data){
+            var assets = [];
+            if(data.length){
+                var len = data.length;
+                for(var i = 0; i < len; i++){
+                    var curr = data[i];
+                    assets.push(
+                        {
+                            'value': curr.id,
+                            'text': curr.label,
+                            'disabled': false
+                        }
+                    );
+                }
+                assets.push(
+                {
+                    'value': null,
+                    'text': "No parent"
+                });
+            }
+            return assets;
+        },
+        preserveSelected: false
+    });
+</script>
+{% endblock js %}
\ No newline at end of file
diff --git a/assets/urls.py b/assets/urls.py
index 5970d64b..09c12047 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -15,6 +15,8 @@ urlpatterns = [
     path('asset/<int:pk>/duplicate/', views.AssetDuplicate.as_view(), name='asset_duplicate'),
     path('asset/delete/', views.asset_delete, name='ajax_asset_delete'),
 
+    path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
+
     path('supplier/list', views.SupplierList.as_view(), name='supplier_list'),
     path('supplier/<int:pk>', views.SupplierDetail.as_view(), name='supplier_detail'),
     path('supplier/create', views.SupplierCreate.as_view(), name='supplier_create'),
diff --git a/assets/views.py b/assets/views.py
index 064ccfc1..02e51892 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -1,7 +1,7 @@
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponse, QueryDict
+from django.http import HttpResponse, QueryDict, JsonResponse
 from django.core import serializers
 from django.views import generic
 from django.contrib.auth import views as auth_views
@@ -22,27 +22,39 @@ class AssetList(LoginRequiredMixin, generic.ListView):
     def get_queryset(self):
         #TODO Feedback to user when search fails
         query = self.request.GET.get('query', "")
+        queryset = self.model.objects.all()
         if len(query) >= 3:
-            return self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
-        elif query != "":
-            return self.model.objects.filter(Q(asset_id__exact=query))
-        else:
-            cat = self.request.GET.get('cat', "")
-            status = self.request.GET.get('status', "")
-            if cat != "None":
-                return self.model.objects.filter(category__name__exact=cat)
-            elif status != "None":
-                return self.model.objects.filter(status__name__exact=status)
-            else:
-                return self.model.objects.all()
+            queryset = self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
+        
+        cat = self.request.GET.get('cat', "")
+        status = self.request.GET.get('status', "")
+        if cat != "":
+            queryset = queryset.filter(category__name__exact=cat)
+        elif status != "":
+            queryset = queryset.filter(status__name__exact=status)
+
+        return queryset
     
     def get_context_data(self, **kwargs):
         context = super(AssetList, self).get_context_data(**kwargs)
         context["search_name"] = self.request.GET.get('query', "")
+
         context["categories"] = models.AssetCategory.objects.all()
+        context["category_select"] = self.request.GET.get('cat', "")
+
         context["statuses"] = models.AssetStatus.objects.all()
+        context["status_select"] = self.request.GET.get('stats', "")
         return context;
 
+class AssetSearch(AssetList):
+    def render_to_response(self, context, **response_kwargs):
+        result = []
+
+        for asset in context["object_list"]:
+            result.append({"id":asset.pk, "label":(asset.asset_id + " | " + asset.description)})
+        
+        return JsonResponse(result, safe=False)
+
 class AssetDetail(LoginRequiredMixin, generic.DetailView):
     model = models.Asset
     template_name = 'asset_update.html'

From 366d9c4130fdd22572915eea352236fc21ca2a21 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sat, 5 Oct 2019 20:33:03 +0100
Subject: [PATCH 06/29] Label the collection 'set parent' field as such

---
 assets/templates/asset_create.html | 9 ++++++---
 assets/templates/asset_update.html | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index 4a908d79..64ae9d84 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -143,8 +143,11 @@
             Collection Details
           </div>
           <div class="panel-body">
-            {% include 'partials/asset_picker.html' %}
-          </div
+            <div class="form-group">
+                <label for="selectpicker">Set Parent:</label>
+                {% include 'partials/asset_picker.html' %}
+            </div>
+          </div>
         </div>
       </div>
       <div class="row">
@@ -158,4 +161,4 @@
 
 {% include 'partials/confirm_delete.html' with object=object %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index a3a228a0..a926d079 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -191,7 +191,10 @@
           </div>
           <div class="panel-body">
             {% if edit or duplicate %}
-            {% include 'partials/asset_picker.html' %}
+            <div class="form-group">
+                <label for="selectpicker">Set Parent:</label>
+                {% include 'partials/asset_picker.html' %}
+            </div>
             {% else%}
               <dl>
                 <dt>Parent</dt>
@@ -234,4 +237,4 @@
 
 {% include 'partials/confirm_delete.html' with object=object %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 7359e05427e9c0ca9cb0a6e7cb5d30e96acd469e Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 21:16:03 +0100
Subject: [PATCH 07/29] Started adding functionality for assets and cables
 forms to be dynamically swapped

---
 assets/forms.py | 5 +++++
 assets/views.py | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/assets/forms.py b/assets/forms.py
index d1a24ef0..3b5ec6ea 100644
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -14,6 +14,11 @@ class AssetForm(forms.ModelForm):
             raise ValidationError("Cannot sell an item before it is acquired")
         return self.cleaned_data["date_sold"]
 
+class CableForm(AssetForm):
+    class Meta:
+        model = models.Cable
+        fields = '__all__'
+
 class SupplierForm(forms.ModelForm):
     class Meta:
         model = models.Supplier
diff --git a/assets/views.py b/assets/views.py
index 02e51892..9549a5c4 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -13,6 +13,12 @@ from dateutil import parser
 import simplejson as json
 from assets import models, forms
 
+class CableFormMixin:
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["cableForm"] = forms.CableForm
+        return context
+
 class AssetList(LoginRequiredMixin, generic.ListView):
     model = models.Asset
     template_name = 'asset_list.html'

From d5f08a8bffdd5db5041e4c9fc898df71e9fb41fe Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 21:16:42 +0100
Subject: [PATCH 08/29] Started adding functionality for assets and cables
 forms to be dynamically swapped

---
 assets/views.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/views.py b/assets/views.py
index 9549a5c4..4f441dcc 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -61,7 +61,7 @@ class AssetSearch(AssetList):
         
         return JsonResponse(result, safe=False)
 
-class AssetDetail(LoginRequiredMixin, generic.DetailView):
+class AssetDetail(LoginRequiredMixin, CableFormMixin, generic.DetailView):
     model = models.Asset
     template_name = 'asset_update.html'
 
@@ -71,7 +71,7 @@ class AssetDetail(LoginRequiredMixin, generic.DetailView):
 #     template_name = 'asset_update.html'
 #     # success_url = reverse_lazy('asset_list')
 
-class AssetEdit(LoginRequiredMixin, generic.UpdateView):
+class AssetEdit(LoginRequiredMixin, CableFormMixin, generic.UpdateView):
     template_name = 'asset_update.html'
     model = models.Asset
     form_class = forms.AssetForm
@@ -91,7 +91,7 @@ class AssetEdit(LoginRequiredMixin, generic.UpdateView):
     def get_success_url(self):
         return reverse("asset_detail", kwargs={"pk":self.object.id})
 
-class AssetCreate(LoginRequiredMixin, generic.CreateView):
+class AssetCreate(LoginRequiredMixin, CableFormMixin, generic.CreateView):
     template_name = 'asset_create.html'
     model = models.Asset
     form_class = forms.AssetForm

From 3d5272d7229cde9eb0a34d65fa9122f90991ae37 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 21:58:49 +0100
Subject: [PATCH 09/29] Fixed incorrecty data being sent to the date_sold field
 in the asset_update template. Fixes last of dates not being passed around
 correctly

---
 assets/templates/asset_update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index a926d079..e73eee3a 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -158,7 +158,7 @@
 
             <div class="form-group">
               <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
-              {% with date_sol=object.form.date_sold|date:"Y-m-d" %}
+              {% 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 %}
             </div>

From a22956cc6262b87a05bc6ad85841649d0fbe7a9a Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sat, 5 Oct 2019 22:42:21 +0100
Subject: [PATCH 10/29] Initial work on cable template things

---
 assets/templates/asset_create.html | 269 ++++++++++++++++++-----------
 assets/templates/asset_update.html |   2 +-
 assets/views.py                    |   1 +
 3 files changed, 169 insertions(+), 103 deletions(-)

diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index 64ae9d84..013958ad 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -20,34 +20,34 @@
 {% else %}
 <form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
 {% endif %}
-  {% include 'form_errors.html' %}
-  <div class="row" style="padding-bottom: 1em">
-    <div class="col-sm-12">
-      <div class="pull-right">
-        {% include 'partials/asset_buttons.html' %}
+    {% include 'form_errors.html' %}
+    <div class="row" style="padding-bottom: 1em">
+      <div class="col-sm-12">
+        <div class="pull-right">
+          {% include 'partials/asset_buttons.html' %}
+        </div>
       </div>
     </div>
-  </div>
-  {% csrf_token %}
-  <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-heading">
-          Asset Details
-        </div>
-        <div class="panel-body">
-          <div class="form-group"
-            <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
-            {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
+    {% csrf_token %}
+    <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-heading">
+            Asset Details
           </div>
-          <div class="form-group">
-            <label for="{{ form.description.id_for_label }}">Description</label>
-            {% render_field form.description|add_class:'form-control' value=object.description %}
-          </div>
-          <div class="form-group">
-            <label for="{{ form.category.id_for_label }}" >Category</label>
-            <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control">
+          <div class="panel-body">
+            <div class="form-group">
+              <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
+              {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
+            </div>
+            <div class="form-group">
+              <label for="{{ form.description.id_for_label }}">Description</label>
+              {% render_field form.description|add_class:'form-control' value=object.description %}
+            </div>
+            <div class="form-group">
+              <label for="{{ form.category.id_for_label }}" >Category</label>
+              <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control" onchange="changeCategory()">
             {% for id, choice in form.category.field.choices %}
               <option value="{{ id }}"
                 {% if object.category.id == id %}
@@ -57,95 +57,147 @@
               </option>
             {% endfor %}
             </select>
-          </div>
-          <div class="form-group">
-            <label for="{{ form.status.id_for_label }}" >Status</label>
-            <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
+            </div>
+            {% render_field form.is_cable|attr:'onchange=toggleBox()' value=object.is_cable %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
+            <div class="form-group">
+              <label for="{{ form.status.id_for_label }}" >Status</label>
+              <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
               {% for id, choice in form.status.field.choices %}
                 <option value="{{ id }}"
                   {% if not object.status.id and choice == "Active" or object.status.id == id %}selected{% endif %}>{{ choice }}</option>
               {% endfor %}
             </select>
-          </div>
-          <div class="form-group">
-            <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
+            </div>
+            <div class="form-group">
+              <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
               {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
-          </div>
-          <!---TODO: Lower default number of lines in comments box-->
-          <div class="form-group">
-            <label for="{{ form.comments.id_for_label }}">Comments</label>
+            </div>
+            <!---TODO: Lower default number of lines in comments box-->
+            <div class="form-group">
+              <label for="{{ form.comments.id_for_label }}">Comments</label>
               {% render_field form.comments|add_class:'form-control' %}
+            </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
-  <div class="row">
-    <div class="col-md-6">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          Purchase Details
-        </div>
-        <div class="panel-body">
-          <div class="form-group">
-            <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
-            <select class="form-control" name="{{ form.purchased_from.name }}" id="{{ form.purchased_from.id_for_label }}">
-              {% for id, choice in form.purchased_from.field.choices %}
-                <option value="{{ id }}"
-                {% if object.purchased_from.id == id %}
-                  selected
-                {% endif %}>
-                {{ choice }}</option>
-              {% endfor %}
-            </select>
-          </div>
-
-          <div class="form-group">
-            <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
-            <div class="input-group">
-              <span class="input-group-addon">£</span>
-              {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
-            <div class="input-group">
-              <span class="input-group-addon">£</span>
-              {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
-              {% 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 %}
-                <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
-                  class="form-control" id="id_date_acquired">
-              {% endif %}
-            </div>
-
-            <div class="form-group">
-              <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
-              {% 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 %}
-            </div>
-          </div>
-        </div>
-      </div>
+    <div class="row">
       <div class="col-md-6">
         <div class="panel panel-default">
           <div class="panel-heading">
-            Collection Details
+            Purchase Details
           </div>
           <div class="panel-body">
-            <div class="form-group">
-                <label for="selectpicker">Set Parent:</label>
+              <div class="form-group">
+                <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
+                <select class="form-control" name="{{ form.purchased_from.name }}" id="{{ form.purchased_from.id_for_label }}">
+                {% for id, choice in form.purchased_from.field.choices %}
+                  <option value="{{ id }}"
+                  {% if object.purchased_from.id == id %}
+                    selected
+                  {% endif %}>
+                  {{ choice }}</option>
+                {% endfor %}
+              </select>
+              </div>
+
+              <div class="form-group">
+                <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
+                <div class="input-group">
+                  <span class="input-group-addon">£</span>
+                  {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
+                <div class="input-group">
+                  <span class="input-group-addon">£</span>
+                  {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
+                {% 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 %}
+                <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
+                    class="form-control" id="id_date_acquired">
+                {% endif %}
+              </div>
+
+              <div class="form-group">
+                <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
+                {% 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 %}
+              </div>
+            </div>
+          </div>
+        </div>
+        {#% if object.is_cable and object.category == "Power" %#}
+        <div class="col-md-6" hidden="true" id="cable-table">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              Cable Details
+            </div>
+            <div class="panel-body">
+              <div class="form-group">
+                <label for="{{ cableform.plug.id_for_label }}">Plug</label>
+                <select name="{{ cableform.plug.name }}" id="{{ cableform.plug.id_for_label }}" class="form-control">
+                  <option value="None">
+                  {% for connector in connectors %}
+                    <option value="{{ connector.pk }}">
+                    {{ connector.description }}
+                    </option>
+                  {%endfor%}
+                </select>
+              </div>
+              <div class="form-group">
+                <label for="{{ cableform.socket.id_for_label }}">Socket</label>
+                <select name="{{ cableform.socket.name }}" id="{{ cableform.socket.id_for_label }}" class="form-control">
+                  <option value="None">
+                  {% for connector in connectors %}
+                    <option value="{{ connector.pk }}">
+                    {{ connector.description }}
+                    </option>
+                  {%endfor%}
+                </select>
+              </div>
+              <div class="form-group">
+                <label for="{{ cableform.length.id_for_label }}">Length</label>
+                {% render_field cableform.length|add_class:'form-control' %}
+                <span class="input-group-addon">{{ cableform.length.help_text }}</span>
+              </div>
+              <div class="form-group">
+                <label for="{{ cableform.csa.id_for_label }}">Cross Sectional Area</label>
+                {% render_field cableform.csa|add_class:'form-control' value=object.csa %}
+                <span class="input-group-addon">{{ cableform.csa.help_text }}</span>
+              </div>
+              <div class="form-group">
+                <label for="{{ cableform.circuits.id_for_label }}">Circuits</label>
+                {% render_field cableform.circuits|add_class:'form-control' value=object.circuits %}
+              </div>
+              <div class="form-group">
+                <label for="{{ cableform.cores.id_for_label }}">Cores</label>
+                {% render_field cableform.cores|add_class:'form-control' value=object.cores %}
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              Collection Details
+            </div>
+            <div class="panel-body">
+              <div class="form-group">
+                <label for="selectpicker">Set Parent</label>
                 {% include 'partials/asset_picker.html' %}
+              </div>
             </div>
           </div>
         </div>
@@ -155,10 +207,23 @@
           {% include 'partials/asset_buttons.html' %}
         </div>
       </div>
-    </div>
-  </div>
-</form>
+  </form>
 
-{% include 'partials/confirm_delete.html' with object=object %}
+  {% include 'partials/confirm_delete.html' with object=object %}
 
-{% endblock %}
+  {% endblock %}
+
+{% block js%}
+<script>
+  function toggleBox() {
+    if(document.getElementById("id_category").value == "26") { //TODO: CHANGE THIS IN PRODUCTION
+      document.getElementById("cable-table").hidden = !document.getElementById("cable-table").hidden ;
+    }
+  }
+  function changeCategory() {
+    if(document.getElementById("id_is_cable").checked) {
+      this.toggleBox();
+    }
+  }
+</script>
+{%endblock%}
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index e73eee3a..286c740e 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -192,7 +192,7 @@
           <div class="panel-body">
             {% if edit or duplicate %}
             <div class="form-group">
-                <label for="selectpicker">Set Parent:</label>
+                <label for="selectpicker">Set Parent</label>
                 {% include 'partials/asset_picker.html' %}
             </div>
             {% else%}
diff --git a/assets/views.py b/assets/views.py
index 4f441dcc..341a0e44 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -100,6 +100,7 @@ class AssetCreate(LoginRequiredMixin, CableFormMixin, generic.CreateView):
         context = super(AssetCreate, self).get_context_data(**kwargs)
         
         context["create"] = True
+        context["connectors"] = models.Connector.objects.all()
         return context
     
     def get_success_url(self):

From d944f99e1f3ffcdfded5faa110b8edb020bca83f Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sat, 5 Oct 2019 23:19:22 +0100
Subject: [PATCH 11/29] Fixed cable form fields not appearing, and made the
 'cable details' group appearing more reliable

---
 assets/templates/asset_create.html | 46 ++++++++++++++----------------
 assets/views.py                    |  2 +-
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index 013958ad..ee6c9e60 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -47,7 +47,7 @@
             </div>
             <div class="form-group">
               <label for="{{ form.category.id_for_label }}" >Category</label>
-              <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control" onchange="changeCategory()">
+              <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control" onchange="checkIfCableHidden()">
             {% for id, choice in form.category.field.choices %}
               <option value="{{ id }}"
                 {% if object.category.id == id %}
@@ -58,7 +58,7 @@
             {% endfor %}
             </select>
             </div>
-            {% render_field form.is_cable|attr:'onchange=toggleBox()' value=object.is_cable %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
+            {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' value=object.is_cable %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
             <div class="form-group">
               <label for="{{ form.status.id_for_label }}" >Status</label>
               <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
@@ -146,8 +146,8 @@
             </div>
             <div class="panel-body">
               <div class="form-group">
-                <label for="{{ cableform.plug.id_for_label }}">Plug</label>
-                <select name="{{ cableform.plug.name }}" id="{{ cableform.plug.id_for_label }}" class="form-control">
+                <label for="{{ cable_form.plug.id_for_label }}">Plug</label>
+                <select name="{{ cable_form.plug.name }}" id="{{ cable_form.plug.id_for_label }}" class="form-control">
                   <option value="None">
                   {% for connector in connectors %}
                     <option value="{{ connector.pk }}">
@@ -157,8 +157,8 @@
                 </select>
               </div>
               <div class="form-group">
-                <label for="{{ cableform.socket.id_for_label }}">Socket</label>
-                <select name="{{ cableform.socket.name }}" id="{{ cableform.socket.id_for_label }}" class="form-control">
+                <label for="{{ cable_form.socket.id_for_label }}">Socket</label>
+                <select name="{{ cable_form.socket.name }}" id="{{ cable_form.socket.id_for_label }}" class="form-control">
                   <option value="None">
                   {% for connector in connectors %}
                     <option value="{{ connector.pk }}">
@@ -168,22 +168,22 @@
                 </select>
               </div>
               <div class="form-group">
-                <label for="{{ cableform.length.id_for_label }}">Length</label>
-                {% render_field cableform.length|add_class:'form-control' %}
-                <span class="input-group-addon">{{ cableform.length.help_text }}</span>
+                <label for="{{ cable_form.length.id_for_label }}">Length</label>
+                {% render_field cable_form.length|add_class:'form-control' %}
+                <span class="input-group-addon">{{ cable_form.length.help_text }}</span>
               </div>
               <div class="form-group">
-                <label for="{{ cableform.csa.id_for_label }}">Cross Sectional Area</label>
-                {% render_field cableform.csa|add_class:'form-control' value=object.csa %}
-                <span class="input-group-addon">{{ cableform.csa.help_text }}</span>
+                <label for="{{ cable_form.csa.id_for_label }}">Cross Sectional Area</label>
+                {% render_field cable_form.csa|add_class:'form-control' value=object.csa %}
+                <span class="input-group-addon">{{ cable_form.csa.help_text }}</span>
               </div>
               <div class="form-group">
-                <label for="{{ cableform.circuits.id_for_label }}">Circuits</label>
-                {% render_field cableform.circuits|add_class:'form-control' value=object.circuits %}
+                <label for="{{ cable_form.circuits.id_for_label }}">Circuits</label>
+                {% render_field cable_form.circuits|add_class:'form-control' value=object.circuits %}
               </div>
               <div class="form-group">
-                <label for="{{ cableform.cores.id_for_label }}">Cores</label>
-                {% render_field cableform.cores|add_class:'form-control' value=object.cores %}
+                <label for="{{ cable_form.cores.id_for_label }}">Cores</label>
+                {% render_field cable_form.cores|add_class:'form-control' value=object.cores %}
               </div>
             </div>
           </div>
@@ -215,15 +215,13 @@
 
 {% block js%}
 <script>
-  function toggleBox() {
-    if(document.getElementById("id_category").value == "26") { //TODO: CHANGE THIS IN PRODUCTION
-      document.getElementById("cable-table").hidden = !document.getElementById("cable-table").hidden ;
-    }
-  }
-  function changeCategory() {
-    if(document.getElementById("id_is_cable").checked) {
-      this.toggleBox();
+  function checkIfCableHidden() {
+    if(document.getElementById("id_category").value == "3" && document.getElementById("id_is_cable").checked) { //TODO: CHANGE THIS IN PRODUCTION
+      document.getElementById("cable-table").hidden = false;
+    } else {
+      document.getElementById("cable-table").hidden = true;
     }
   }
+  checkIfCableHidden()
 </script>
 {%endblock%}
diff --git a/assets/views.py b/assets/views.py
index 341a0e44..daf81058 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -16,7 +16,7 @@ from assets import models, forms
 class CableFormMixin:
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["cableForm"] = forms.CableForm
+        context["cable_form"] = forms.CableForm(**self.get_form_kwargs())
         return context
 
 class AssetList(LoginRequiredMixin, generic.ListView):

From 7b795ac332c799b3583a660cea658e269888119d Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sun, 6 Oct 2019 01:03:41 +0100
Subject: [PATCH 12/29] Fixed some bugs with search

---
 assets/templates/asset_list.html | 6 +++---
 assets/views.py                  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 3d1ed407..e3854b58 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -8,7 +8,7 @@
   <h1 class="text-center">Asset List</h1>
 </div>
 
-<form id="asset-search-form">
+<form id="asset-search-form" method="get">
   {% csrf_token %}
   <div class="input-group">
     <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}">
@@ -20,7 +20,7 @@
     <select name="cat" class="form-control">
           <option value="">None</option>
           {% for name in categories %}
-          {% if name == category_select %}
+          {% if name.name == category_select %}
           <option selected>
           {% else %}
           <option>
@@ -35,7 +35,7 @@
     <select name="status" class="form-control">
     <option value="">None</option>
             {% for name in statuses %}
-            {% if name == status_select %}
+            {% if name.name == status_select %}
             <option selected>
             {% else %}
             <option>
diff --git a/assets/views.py b/assets/views.py
index daf81058..3a6c7536 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -36,7 +36,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
         status = self.request.GET.get('status', "")
         if cat != "":
             queryset = queryset.filter(category__name__exact=cat)
-        elif status != "":
+        if status != "":
             queryset = queryset.filter(status__name__exact=status)
 
         return queryset
@@ -49,7 +49,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
         context["category_select"] = self.request.GET.get('cat', "")
 
         context["statuses"] = models.AssetStatus.objects.all()
-        context["status_select"] = self.request.GET.get('stats', "")
+        context["status_select"] = self.request.GET.get('status', "")
         return context;
 
 class AssetSearch(AssetList):

From 85db26bdb1a81102c43999b6f0db4e568da8eee5 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sun, 6 Oct 2019 01:13:26 +0100
Subject: [PATCH 13/29] Changed functionality of asset search - now IDs are
 always searched even if the string is under 3 characters in length

---
 assets/views.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/assets/views.py b/assets/views.py
index 3a6c7536..9c6a8e52 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -28,9 +28,12 @@ class AssetList(LoginRequiredMixin, generic.ListView):
     def get_queryset(self):
         #TODO Feedback to user when search fails
         query = self.request.GET.get('query', "")
-        queryset = self.model.objects.all()
-        if len(query) >= 3:
+        if len(query) == 0:
+            queryset = self.model.objects.all()
+        elif len(query) >= 3:
             queryset = self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
+        else:
+            queryset = self.model.objects.filter(Q(asset_id__exact=query))
         
         cat = self.request.GET.get('cat', "")
         status = self.request.GET.get('status', "")

From 98b9697366e7713bd8e06a7d336aa57f8dcb86fa Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Mon, 7 Oct 2019 10:45:23 +0100
Subject: [PATCH 14/29] Temporary fix to cable_form tag. No cable functionality
 has actually been added, that can be done once the frontend is in place to
 handle it.

---
 assets/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/views.py b/assets/views.py
index 9c6a8e52..efbffa5f 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -16,7 +16,7 @@ from assets import models, forms
 class CableFormMixin:
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["cable_form"] = forms.CableForm(**self.get_form_kwargs())
+        context["cable_form"] = forms.CableForm()
         return context
 
 class AssetList(LoginRequiredMixin, generic.ListView):

From b8b82c0970b3e35e4805acdc1670ee448eb4387b Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Mon, 7 Oct 2019 16:41:52 +0100
Subject: [PATCH 15/29] Prettify search/filter a bit

---
 assets/templates/asset_list.html | 73 +++++++++++++++++---------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index e3854b58..c6aa1281 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -8,45 +8,48 @@
   <h1 class="text-center">Asset List</h1>
 </div>
 
-<form id="asset-search-form" method="get">
+<form id="asset-search-form" method="get" class="form-inline pull-right">
   {% csrf_token %}
-  <div class="input-group">
-    <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}">
+  <div class="input-group pull-right" style="width: auto;">
+    <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}" style="width: 250px">
     <label for="asset_id" class="sr-only">Asset ID/Description:</label>
     <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
   </div>
-  <div class="form-group">
-    <label for="cat">Category:</label>
-    <select name="cat" class="form-control">
-          <option value="">None</option>
-          {% for name in categories %}
-          {% if name.name == category_select %}
-          <option selected>
-          {% else %}
-          <option>
-          {% endif %}
-            {{ name }}
-          </option>
-          {% endfor %}
-      </select>
-  </div>
-  <div class="form-group">
-    <label for="status">Status:</label>
-    <select name="status" class="form-control">
-    <option value="">None</option>
-            {% for name in statuses %}
-            {% if name.name == status_select %}
-            <option selected>
-            {% else %}
-            <option>
-            {% endif %}
-              {{ name }}
-            </option>
-            {% endfor %}
-    </select>
-  </div>
-  <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
-  <button type="submit" class="btn btn-default">Filter</button>
+  <br>
+  <div style="margin-top: 1em;" class="pull-right">
+      <div class="form-group">
+        <label for="cat" class="sr-only">Category</label>
+        <select name="cat" class="form-control">
+              <option value="" class="text-muted">(category)</option>
+              {% for name in categories %}
+              {% if name.name == category_select %}
+              <option selected>
+              {% else %}
+              <option>
+              {% endif %}
+                {{ name }}
+              </option>
+              {% endfor %}
+          </select>
+      </div>
+      <div class="form-group">
+        <label for="status" class="sr-only">Status</label>
+        <select name="status" class="form-control">
+        <option value="">(status)</option>
+                {% for name in statuses %}
+                {% if name.name == status_select %}
+                <option selected>
+                {% else %}
+                <option>
+                {% endif %}
+                  {{ name }}
+                </option>
+                {% endfor %}
+        </select>
+      </div>
+      <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
+      <button type="submit" class="btn btn-default">Filter</button>
+    </div>
 </form>
 
 <table class="table">

From d30bd9850de5714026a686893b7822f2986817d2 Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Mon, 7 Oct 2019 16:46:15 +0100
Subject: [PATCH 16/29] Align text against buttons (middle) in asset list

---
 assets/templates/partials/asset_list_table_body.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index db4a62a9..523e99e1 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -11,10 +11,10 @@
                   text-muted
                 {% endif %}
                 ">
-        <td><a href="{% url 'asset_detail' item.pk %}">{{ item.asset_id }}</a></td>
-        <td>{{ item.description }}</td>
-        <td>{{ item.category }}</td>
-        <td>{{ item.status }}</td>
+        <td style="vertical-align: middle;"><a href="{% url 'asset_detail' item.pk %}">{{ item.asset_id }}</a></td>
+        <td style="vertical-align: middle;">{{ item.description }}</td>
+        <td style="vertical-align: middle;">{{ item.category }}</td>
+        <td style="vertical-align: middle;">{{ item.status }}</td>
         <td>
             <div class="btn-group" role="group">
                 <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_detail' item.pk %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>

From fe1541acbf3eebe1a5f8dfd98cfa7ba1d48f4d09 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Tue, 8 Oct 2019 01:33:38 +0100
Subject: [PATCH 17/29] Cables can now be created.

---
 assets/forms.py                               | 16 +++++----
 .../management/commands/createSampleData.py   | 12 +++++++
 .../management/commands/deleteSampleData.py   |  2 +-
 assets/templates/asset_create.html            | 32 ++++++++---------
 assets/views.py                               | 36 ++++++++++---------
 5 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/assets/forms.py b/assets/forms.py
index 3b5ec6ea..e33c87ec 100644
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -5,21 +5,25 @@ from assets import models
 
 
 class AssetForm(forms.ModelForm):
-    class Meta:
-        model = models.Asset
-        fields = '__all__'
+    
 
     def clean_date_sold(self):
         if self.cleaned_data["date_sold"] and self.cleaned_data["date_acquired"] > self.cleaned_data["date_sold"]:
             raise ValidationError("Cannot sell an item before it is acquired")
         return self.cleaned_data["date_sold"]
+    
+    class Meta:
+        model = models.Asset
+        fields = '__all__'
+        widgets = {
+            'is_cable' : forms.CheckboxInput()
+        }
 
 class CableForm(AssetForm):
-    class Meta:
+    class Meta(AssetForm.Meta):
         model = models.Cable
-        fields = '__all__'
 
-class SupplierForm(forms.ModelForm):
+class SupplierForm(forms.Form):
     class Meta:
         model = models.Supplier
         fields = '__all__'
diff --git a/assets/management/commands/createSampleData.py b/assets/management/commands/createSampleData.py
index 0d5beeb0..d054b17d 100644
--- a/assets/management/commands/createSampleData.py
+++ b/assets/management/commands/createSampleData.py
@@ -21,6 +21,7 @@ class Command(BaseCommand):
         self.create_statuses()
         self.create_suppliers()
         self.create_assets()
+        self.create_connectors()
 
     def create_categories(self):
         categories = ['Case', 'Video', 'General', 'Sound', 'Lighting', 'Rigging']
@@ -60,3 +61,14 @@ class Command(BaseCommand):
                 asset.purchased_from = random.choice(suppliers)
 
             asset.save()
+
+    def create_connectors(self):
+        connectors = [
+            { "description":"13A UK", "current_rating":13, "voltage_rating":230, "num_pins":3 },
+            { "description":"16A", "current_rating":16, "voltage_rating":230, "num_pins":3 },
+            { "description":"32/3", "current_rating":32, "voltage_rating":400, "num_pins":5 },
+            { "description":"Socapex", "current_rating":23, "voltage_rating":600, "num_pins":19 },
+        ]
+        for connector in connectors:
+            conn = models.Connector.objects.create(**connector)
+            conn.save()
\ No newline at end of file
diff --git a/assets/management/commands/deleteSampleData.py b/assets/management/commands/deleteSampleData.py
index d58bee5f..f0338faa 100644
--- a/assets/management/commands/deleteSampleData.py
+++ b/assets/management/commands/deleteSampleData.py
@@ -21,7 +21,7 @@ class Command(BaseCommand):
         self.delete_objects(models.AssetCategory)
         self.delete_objects(models.AssetStatus)
         self.delete_objects(models.Supplier)
-        self.delete_objects(models.Collection)
+        self.delete_objects(models.Connector)
         self.delete_objects(models.Asset)
 
     def delete_objects(self, model):
diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index ee6c9e60..a29c3635 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -58,7 +58,7 @@
             {% endfor %}
             </select>
             </div>
-            {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' value=object.is_cable %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
+            {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
             <div class="form-group">
               <label for="{{ form.status.id_for_label }}" >Status</label>
               <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
@@ -146,8 +146,8 @@
             </div>
             <div class="panel-body">
               <div class="form-group">
-                <label for="{{ cable_form.plug.id_for_label }}">Plug</label>
-                <select name="{{ cable_form.plug.name }}" id="{{ cable_form.plug.id_for_label }}" class="form-control">
+                <label for="{{ form.plug.id_for_label }}">Plug</label>
+                <select name="{{ form.plug.name }}" id="{{ form.plug.id_for_label }}" class="form-control">
                   <option value="None">
                   {% for connector in connectors %}
                     <option value="{{ connector.pk }}">
@@ -157,8 +157,8 @@
                 </select>
               </div>
               <div class="form-group">
-                <label for="{{ cable_form.socket.id_for_label }}">Socket</label>
-                <select name="{{ cable_form.socket.name }}" id="{{ cable_form.socket.id_for_label }}" class="form-control">
+                <label for="{{ form.socket.id_for_label }}">Socket</label>
+                <select name="{{ form.socket.name }}" id="{{ form.socket.id_for_label }}" class="form-control">
                   <option value="None">
                   {% for connector in connectors %}
                     <option value="{{ connector.pk }}">
@@ -168,22 +168,22 @@
                 </select>
               </div>
               <div class="form-group">
-                <label for="{{ cable_form.length.id_for_label }}">Length</label>
-                {% render_field cable_form.length|add_class:'form-control' %}
-                <span class="input-group-addon">{{ cable_form.length.help_text }}</span>
+                <label for="{{ form.length.id_for_label }}">Length</label>
+                {% render_field form.length|add_class:'form-control' %}
+                <span class="input-group-addon">{{ form.length.help_text }}</span>
               </div>
               <div class="form-group">
-                <label for="{{ cable_form.csa.id_for_label }}">Cross Sectional Area</label>
-                {% render_field cable_form.csa|add_class:'form-control' value=object.csa %}
-                <span class="input-group-addon">{{ cable_form.csa.help_text }}</span>
+                <label for="{{ form.csa.id_for_label }}">Cross Sectional Area</label>
+                {% render_field form.csa|add_class:'form-control' value=object.csa %}
+                <span class="input-group-addon">{{ form.csa.help_text }}</span>
               </div>
               <div class="form-group">
-                <label for="{{ cable_form.circuits.id_for_label }}">Circuits</label>
-                {% render_field cable_form.circuits|add_class:'form-control' value=object.circuits %}
+                <label for="{{ form.circuits.id_for_label }}">Circuits</label>
+                {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
               </div>
               <div class="form-group">
-                <label for="{{ cable_form.cores.id_for_label }}">Cores</label>
-                {% render_field cable_form.cores|add_class:'form-control' value=object.cores %}
+                <label for="{{ form.cores.id_for_label }}">Cores</label>
+                {% render_field form.cores|add_class:'form-control' value=object.cores %}
               </div>
             </div>
           </div>
@@ -216,7 +216,7 @@
 {% block js%}
 <script>
   function checkIfCableHidden() {
-    if(document.getElementById("id_category").value == "3" && document.getElementById("id_is_cable").checked) { //TODO: CHANGE THIS IN PRODUCTION
+    if(document.getElementById("id_category").value == "33" && document.getElementById("id_is_cable").checked) { //TODO: CHANGE THIS IN PRODUCTION
       document.getElementById("cable-table").hidden = false;
     } else {
       document.getElementById("cable-table").hidden = true;
diff --git a/assets/views.py b/assets/views.py
index efbffa5f..3791edbc 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -13,12 +13,6 @@ from dateutil import parser
 import simplejson as json
 from assets import models, forms
 
-class CableFormMixin:
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["cable_form"] = forms.CableForm()
-        return context
-
 class AssetList(LoginRequiredMixin, generic.ListView):
     model = models.Asset
     template_name = 'asset_list.html'
@@ -64,7 +58,7 @@ class AssetSearch(AssetList):
         
         return JsonResponse(result, safe=False)
 
-class AssetDetail(LoginRequiredMixin, CableFormMixin, generic.DetailView):
+class AssetDetail(LoginRequiredMixin, generic.DetailView):
     model = models.Asset
     template_name = 'asset_update.html'
 
@@ -74,27 +68,29 @@ class AssetDetail(LoginRequiredMixin, CableFormMixin, generic.DetailView):
 #     template_name = 'asset_update.html'
 #     # success_url = reverse_lazy('asset_list')
 
-class AssetEdit(LoginRequiredMixin, CableFormMixin, generic.UpdateView):
+class AssetEdit(LoginRequiredMixin, generic.UpdateView):
     template_name = 'asset_update.html'
     model = models.Asset
-    form_class = forms.AssetForm
 
     def get_context_data(self, **kwargs):
-        context = super(AssetEdit, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context['form'] = forms.AssetForm
-        # context['asset_names'] = models.Asset.objects.values_list('asset_id', 'description').order_by('-date_acquired')[]
-
         context['edit'] = True
 
         return context
 
+    def get_form_class(self):
+        if self.object.is_cable:
+            return forms.CableForm
+        return forms.AssetForm
+
     def form_invalid(self, form):
         return super().form_invalid(form)
 
     def get_success_url(self):
         return reverse("asset_detail", kwargs={"pk":self.object.id})
 
-class AssetCreate(LoginRequiredMixin, CableFormMixin, generic.CreateView):
+class AssetCreate(LoginRequiredMixin, generic.CreateView):
     template_name = 'asset_create.html'
     model = models.Asset
     form_class = forms.AssetForm
@@ -106,6 +102,14 @@ class AssetCreate(LoginRequiredMixin, CableFormMixin, generic.CreateView):
         context["connectors"] = models.Connector.objects.all()
         return context
     
+    def get_form_class(self):
+        if self.request.method == "POST":
+            if 'is_cable' in self.request.POST:
+                return forms.CableForm
+            return forms.AssetForm
+        else:
+            return forms.CableForm #For GET, so that all form fields can be placed
+    
     def get_success_url(self):
         return reverse("asset_detail", kwargs={"pk":self.object.id})
 
@@ -116,16 +120,14 @@ class DuplicateMixin:
         return self.render_to_response(self.get_context_data())
 
 class AssetDuplicate(DuplicateMixin, AssetCreate):
-    template_name = 'asset_create.html'
     model = models.Asset
-    form_class = forms.AssetForm
 
     def get_context_data(self, **kwargs):
-        context = super(AssetCreate, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         context["create"] = None
         context["duplicate"] = True
         context['previous_asset_id'] = self.get_object().asset_id
-        context["previous_asset_pk"] = pk = self.kwargs.get(self.pk_url_kwarg)
+        context["previous_asset_pk"] = self.kwargs.get(self.pk_url_kwarg)
         return context
 
 @login_required()

From f9c851b96018d32d7ac59bfc26dda63bf196b560 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 8 Oct 2019 13:53:24 +0100
Subject: [PATCH 18/29] Sod it. Cable form display now depends only on checkbox
 state

---
 assets/templates/asset_create.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index a29c3635..881d4ff1 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -47,7 +47,7 @@
             </div>
             <div class="form-group">
               <label for="{{ form.category.id_for_label }}" >Category</label>
-              <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control" onchange="checkIfCableHidden()">
+              <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control">
             {% for id, choice in form.category.field.choices %}
               <option value="{{ id }}"
                 {% if object.category.id == id %}
@@ -216,12 +216,12 @@
 {% block js%}
 <script>
   function checkIfCableHidden() {
-    if(document.getElementById("id_category").value == "33" && document.getElementById("id_is_cable").checked) { //TODO: CHANGE THIS IN PRODUCTION
-      document.getElementById("cable-table").hidden = false;
+    if(document.getElementById("id_is_cable").checked) {
+            document.getElementById("cable-table").hidden = false;
     } else {
       document.getElementById("cable-table").hidden = true;
     }
   }
-  checkIfCableHidden()
+  checkIfCableHidden();
 </script>
 {%endblock%}

From bfd4a380f3c622425eca4daef8123700ac3fb27a Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 8 Oct 2019 13:56:56 +0100
Subject: [PATCH 19/29] Wrap cableform input groups

---
 assets/templates/asset_create.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
index 881d4ff1..61a12e20 100644
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -169,13 +169,17 @@
               </div>
               <div class="form-group">
                 <label for="{{ form.length.id_for_label }}">Length</label>
-                {% render_field form.length|add_class:'form-control' %}
-                <span class="input-group-addon">{{ form.length.help_text }}</span>
+                <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="form-group">
                 <label for="{{ form.csa.id_for_label }}">Cross Sectional Area</label>
-                {% render_field form.csa|add_class:'form-control' value=object.csa %}
-                <span class="input-group-addon">{{ form.csa.help_text }}</span>
+                <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 class="form-group">
                 <label for="{{ form.circuits.id_for_label }}">Circuits</label>

From 1b124a9da9c48aabe01c0019cd7f8f1ecd2fcbe8 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 8 Oct 2019 16:49:10 +0100
Subject: [PATCH 20/29] Partialize alllllll the things

Split each form section into its own partial which handles both the form and display view of that section.
---
 assets/templates/asset_create.html            | 214 ++--------------
 assets/templates/asset_update.html            | 239 +++---------------
 assets/templates/partials/asset_form.html     |  75 ++++++
 assets/templates/partials/cable_form.html     |  75 ++++++
 assets/templates/partials/parent_form.html    |  41 +++
 .../partials/purchasedetails_form.html        |  76 ++++++
 6 files changed, 327 insertions(+), 393 deletions(-)
 create mode 100644 assets/templates/partials/asset_form.html
 create mode 100644 assets/templates/partials/cable_form.html
 create mode 100644 assets/templates/partials/parent_form.html
 create mode 100644 assets/templates/partials/purchasedetails_form.html

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 @@
 </div>
 {% if duplicate %}
 <form method="post" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_pk%}">
-{% else %}
-<form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
-{% endif %}
+  {% else %}
+  <form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
+    {% endif %}
     {% include 'form_errors.html' %}
     <div class="row" style="padding-bottom: 1em">
       <div class="col-sm-12">
@@ -32,200 +32,40 @@
     <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-heading">
-            Asset Details
-          </div>
-          <div class="panel-body">
-            <div class="form-group">
-              <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
-              {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
-            </div>
-            <div class="form-group">
-              <label for="{{ form.description.id_for_label }}">Description</label>
-              {% render_field form.description|add_class:'form-control' value=object.description %}
-            </div>
-            <div class="form-group">
-              <label for="{{ form.category.id_for_label }}" >Category</label>
-              <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control">
-            {% for id, choice in form.category.field.choices %}
-              <option value="{{ id }}"
-                {% if object.category.id == id %}
-                  selected
-                {% endif %}>
-              {{ choice }}
-              </option>
-            {% endfor %}
-            </select>
-            </div>
-            {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
-            <div class="form-group">
-              <label for="{{ form.status.id_for_label }}" >Status</label>
-              <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
-              {% for id, choice in form.status.field.choices %}
-                <option value="{{ id }}"
-                  {% if not object.status.id and choice == "Active" or object.status.id == id %}selected{% endif %}>{{ choice }}</option>
-              {% endfor %}
-            </select>
-            </div>
-            <div class="form-group">
-              <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
-              {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
-            </div>
-            <!---TODO: Lower default number of lines in comments box-->
-            <div class="form-group">
-              <label for="{{ form.comments.id_for_label }}">Comments</label>
-              {% render_field form.comments|add_class:'form-control' %}
-            </div>
-          </div>
-        </div>
+        {% include 'partials/asset_form.html' %}
       </div>
     </div>
     <div class="row">
       <div class="col-md-6">
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            Purchase Details
-          </div>
-          <div class="panel-body">
-              <div class="form-group">
-                <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
-                <select class="form-control" name="{{ form.purchased_from.name }}" id="{{ form.purchased_from.id_for_label }}">
-                {% for id, choice in form.purchased_from.field.choices %}
-                  <option value="{{ id }}"
-                  {% if object.purchased_from.id == id %}
-                    selected
-                  {% endif %}>
-                  {{ choice }}</option>
-                {% endfor %}
-              </select>
-              </div>
-
-              <div class="form-group">
-                <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
-                <div class="input-group">
-                  <span class="input-group-addon">£</span>
-                  {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
-                <div class="input-group">
-                  <span class="input-group-addon">£</span>
-                  {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
-                {% 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 %}
-                <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
-                    class="form-control" id="id_date_acquired">
-                {% endif %}
-              </div>
-
-              <div class="form-group">
-                <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
-                {% 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 %}
-              </div>
-            </div>
-          </div>
-        </div>
-        {#% if object.is_cable and object.category == "Power" %#}
-        <div class="col-md-6" hidden="true" id="cable-table">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              Cable Details
-            </div>
-            <div class="panel-body">
-              <div class="form-group">
-                <label for="{{ form.plug.id_for_label }}">Plug</label>
-                <select name="{{ form.plug.name }}" id="{{ form.plug.id_for_label }}" class="form-control">
-                  <option value="None">
-                  {% for connector in connectors %}
-                    <option value="{{ connector.pk }}">
-                    {{ connector.description }}
-                    </option>
-                  {%endfor%}
-                </select>
-              </div>
-              <div class="form-group">
-                <label for="{{ form.socket.id_for_label }}">Socket</label>
-                <select name="{{ form.socket.name }}" id="{{ form.socket.id_for_label }}" class="form-control">
-                  <option value="None">
-                  {% for connector in connectors %}
-                    <option value="{{ connector.pk }}">
-                    {{ connector.description }}
-                    </option>
-                  {%endfor%}
-                </select>
-              </div>
-              <div class="form-group">
-                <label for="{{ form.length.id_for_label }}">Length</label>
-                <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="form-group">
-                <label for="{{ form.csa.id_for_label }}">Cross Sectional Area</label>
-                <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 class="form-group">
-                <label for="{{ form.circuits.id_for_label }}">Circuits</label>
-                {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
-              </div>
-              <div class="form-group">
-                <label for="{{ form.cores.id_for_label }}">Cores</label>
-                {% render_field form.cores|add_class:'form-control' value=object.cores %}
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="col-md-4">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              Collection Details
-            </div>
-            <div class="panel-body">
-              <div class="form-group">
-                <label for="selectpicker">Set Parent</label>
-                {% include 'partials/asset_picker.html' %}
-              </div>
-            </div>
-          </div>
-        </div>
+        {% include 'partials/purchasedetails_form.html' %}
       </div>
-      <div class="row">
-        <div class="col-md-12">
-          {% include 'partials/asset_buttons.html' %}
-        </div>
+      <div class="col-md-6" hidden="true" id="cable-table">
+        {% include 'partials/cable_form.html' %}
       </div>
+      <div class="col-md-4">
+        {% include 'partials/parent_form.html' %}
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12">
+        {% include 'partials/asset_buttons.html' %}
+      </div>
+    </div>
   </form>
 
   {% include 'partials/confirm_delete.html' with object=object %}
 
   {% endblock %}
 
-{% block js%}
-<script>
-  function checkIfCableHidden() {
-    if(document.getElementById("id_is_cable").checked) {
-            document.getElementById("cable-table").hidden = false;
-    } else {
-      document.getElementById("cable-table").hidden = true;
+  {% block js%}
+  <script>
+    function checkIfCableHidden() {
+      if (document.getElementById("id_is_cable").checked) {
+        document.getElementById("cable-table").hidden = false;
+      } else {
+        document.getElementById("cable-table").hidden = true;
+      }
     }
-  }
-  checkIfCableHidden();
-</script>
-{%endblock%}
+    checkIfCableHidden();
+  </script>
+  {%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 @@
   <h1>
       {% 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 %}
   </h1>
 </div>
-{% if create %}
-<form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
-{% else %}
 <form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.pk%}">
-{% endif %}
-{% include 'form_errors.html' %}
-<div class="row" style="padding-bottom: 1em">
-  <div class="col-sm-12">
-    <div class="pull-right">
-      {% include 'partials/asset_buttons.html' %}
+  {% include 'form_errors.html' %}
+  <div class="row" style="padding-bottom: 1em">
+    <div class="col-sm-12">
+      <div class="pull-right">
+        {% include 'partials/asset_buttons.html' %}
+      </div>
     </div>
   </div>
-</div>
   {% csrf_token %}
   <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-heading">
-          Asset Details
-        </div>
-        <div class="panel-body">
-          {% if edit or duplicate %}
-          <div class="form-group">
-            <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
-            {% 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 %}
-          </div>
-          <div class="form-group">
-            <label for="{{ form.description.id_for_label }}"
-                                       >Description</label>
-            {% render_field form.description|add_class:'form-control' value=object.description %}
-          </div>
-          <div class="form-group">
-            <label for="{{ form.category.id_for_label }}" >Category</label>
-            <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}"
-                                        required class="form-control">
-            {% for id, choice in form.category.field.choices %}
-                <option value="{{ id }}"
-                        {% if object.category.id == id %}selected{% endif %}>{{ choice }}</option>
-            {% endfor %}
-        </select>
-          </div>
-          <div class="form-group">
-            <label for="{{ form.status.id_for_label }}" >Status</label>
-            <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
-            {% for id, choice in form.status.field.choices %}
-                <option value="{{ id }}"
-                        {% if not object.status.id and choice == "Active" or object.status.id == id %}selected{% endif %}>{{ choice }}</option>
-            {% endfor %}
-        </select>
-          </div>
-          <div class="form-group">
-            <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
-            {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
-          </div>
-          <!---TODO: Lower default number of lines in comments box-->
-          <div class="form-group">
-            <label for="{{ form.comments.id_for_label }}">Comments</label>
-            {% render_field form.comments|add_class:'form-control' %}
-          </div>
-          {% else %}
-          <dt>Asset ID</dt>
-          <dd>{{ object.asset_id }}</dd>
-
-          <dt>Description</dt>
-          <dd>{{ object.description }}</dd>
-
-          <dt>Category</dt>
-          <dd>{{ object.category }}</dd>
-
-          <dt>Status</dt>
-          <dd>{{ object.status }}</dd>
-
-          <dt>Serial Number</dt>
-          <dd>{{ object.serial_number|default:'-' }}</dd>
-
-          <dt>Comments</dt>
-          <dd>{{ object.comments|default:'-'|linebreaksbr }}</dd>
-          {% endif %}
-        </div>
-      </div>
+      {% include 'partials/asset_form.html' %}
     </div>
   </div>
   <div class="row">
     <div class="col-md-6">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          Purchase Details
-        </div>
-        <div class="panel-body">
-          {% if edit or duplicate %}
-          <div class="form-group">
-            <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
-            <select class="form-control" name="{{ form.purchased_from.name }}"
-                                            id="{{ form.purchased_from.id_for_label }}">
-                                        {% for id, choice in form.purchased_from.field.choices %}
-                                            <option value="{{ id }}"
-                                                    {% if object.purchased_from.id == id %}selected{% endif %}>{{ choice }}</option>
-                                        {% endfor %}
-                                    </select>
-          </div>
-
-          <div class="form-group">
-            <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
-            <div class="input-group">
-              <span class="input-group-addon">£</span>
-              {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
-            <div class="input-group">
-              <span class="input-group-addon">£</span>
-              {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label for="{{ form.date_acquired.id_for_label }}" >Date
-                                        Acquired</label>
-            {% 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 %}
-            <input type="date" name="date_acquired" value="{% now "%Y-%m-%d%" %}"
-                                               class="form-control" id="id_date_acquired">
-                                    {% endif %}
-            </div>
-
-            <div class="form-group">
-              <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
-              {% 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 %}
-            </div>
-            {% else %}
-            <dl>
-              <dt>Purchased From</dt>
-              <dd>{{ object.purchased_from|default_if_none:'-' }}</dd>
-
-              <dt>Purchase Price</dt>
-              <dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
-
-              <dt>Salvage Value</dt>
-              <dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
-
-              <dt>Date Acquired</dt>
-              <dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
-              {% if object.date_sold %}
-              <dt>Date Sold</dt>
-              <dd>{{ object.date_sold|default_if_none:'-' }}</dd>
-              {% endif %}
-            </dl>
-            {% endif %}
-          </div>
-        </div>
-      </div>
-      <div class="col-md-6">
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            Collection Details
-          </div>
-          <div class="panel-body">
-            {% if edit or duplicate %}
-            <div class="form-group">
-                <label for="selectpicker">Set Parent</label>
-                {% include 'partials/asset_picker.html' %}
-            </div>
-            {% else%}
-              <dl>
-                <dt>Parent</dt>
-                <dd>
-                  {% if object.parent %}
-                  <a href="{% url 'asset_detail' object.parent.pk %}">
-                  {{ object.parent.asset_id }} - {{ object.parent.description }}
-                  </a>
-                  {% else %}
-                  <span>-</span>
-                  {% endif %}
-                </dd>
-
-                <dt>Children</dt>
-                {% if object.asset_parent.all %}
-                {% for child in object.asset_parent.all %}
-                <dd>
-                  <a href="{% url 'asset_detail' child.pk %}">
-                  {{ child.asset_id }} - {{ child.description }}
-                  </a>
-                </dd>
-                {% endfor %}
-                {% else %}
-                <dd><span>-</span></dd>
-                {% endif %}
-              </dl>
-              {% endif %}
-            </div>
-          </div>
-        </div>
-      </div>
-    <div class="row">
-      <div class="col-md-12">
-        {% include 'partials/asset_buttons.html' %}
-      </div>
+      {% include 'partials/purchasedetails_form.html' %}
     </div>
+    <div class="col-md-6" hidden="true" id="cable-table">
+      {% include 'partials/cable_form.html' %}
+    </div>
+    <div class="col-md-4">
+      {% include 'partials/parent_form.html' %}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      {% include 'partials/asset_buttons.html' %}
+    </div>
+  </div>
 </form>
 
-
-
 {% include 'partials/confirm_delete.html' with object=object %}
 
 {% endblock %}
+
+{% block js%}
+<script>
+  function checkIfCableHidden() {
+    if (document.getElementById("id_is_cable").checked) {
+      document.getElementById("cable-table").hidden = false;
+    } else {
+      document.getElementById("cable-table").hidden = true;
+    }
+  }
+  checkIfCableHidden();
+</script>
+{%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 %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Asset Details
+  </div>
+  <div class="panel-body">
+    {% if edit or duplicate %}
+    <div class="form-group">
+        <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
+        {% 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 %}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.description.id_for_label }}">Description</label>
+      {% render_field form.description|add_class:'form-control' value=object.description %}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.category.id_for_label }}" >Category</label>
+      <select name="{{ form.category.name }}" id="{{ form.category.id_for_label }}" required class="form-control">
+            {% for id, choice in form.category.field.choices %}
+              <option value="{{ id }}"
+                {% if object.category.id == id %}
+                  selected
+                {% endif %}>
+              {{ choice }}
+              </option>
+            {% endfor %}
+            </select>
+    </div>
+    {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
+    <div class="form-group">
+      <label for="{{ form.status.id_for_label }}" >Status</label>
+      <select class="form-control" name="{{ form.status.name }}" id="{{ form.status.id_for_label }}" required>
+              {% for id, choice in form.status.field.choices %}
+                <option value="{{ id }}"
+                  {% if not object.status.id and choice == "Active" or object.status.id == id %}selected{% endif %}>{{ choice }}</option>
+              {% endfor %}
+            </select>
+    </div>
+    <div class="form-group">
+      <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
+      {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
+    </div>
+    <!---TODO: Lower default number of lines in comments box-->
+    <div class="form-group">
+      <label for="{{ form.comments.id_for_label }}">Comments</label>
+      {% render_field form.comments|add_class:'form-control' %}
+    </div>
+    {% else %}
+    <dt>Asset ID</dt>
+    <dd>{{ object.asset_id }}</dd>
+
+    <dt>Description</dt>
+    <dd>{{ object.description }}</dd>
+
+    <dt>Category</dt>
+    <dd>{{ object.category }}</dd>
+
+    <dt>Status</dt>
+    <dd>{{ object.status }}</dd>
+
+    <dt>Serial Number</dt>
+    <dd>{{ object.serial_number|default:'-' }}</dd>
+
+    <dt>Comments</dt>
+    <dd>{{ object.comments|default:'-'|linebreaksbr }}</dd>
+    {% endif %}
+  </div>
+</div>
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 %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Cable Details
+  </div>
+  <div class="panel-body">
+    {% if edit or duplicate %}
+    <div class="form-group">
+      <label for="{{ form.plug.id_for_label }}">Plug</label>
+      <select name="{{ form.plug.name }}" id="{{ form.plug.id_for_label }}" class="form-control">
+                  <option value="None">
+                  {% for connector in connectors %}
+                    <option value="{{ connector.pk }}">
+                    {{ connector.description }}
+                    </option>
+                  {%endfor%}
+                </select>
+    </div>
+    <div class="form-group">
+      <label for="{{ form.socket.id_for_label }}">Socket</label>
+      <select name="{{ form.socket.name }}" id="{{ form.socket.id_for_label }}" class="form-control">
+                  <option value="None">
+                  {% for connector in connectors %}
+                    <option value="{{ connector.pk }}">
+                    {{ connector.description }}
+                    </option>
+                  {%endfor%}
+                </select>
+    </div>
+    <div class="form-group">
+      <label for="{{ form.length.id_for_label }}">Length</label>
+      <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="form-group">
+      <label for="{{ form.csa.id_for_label }}">Cross Sectional Area</label>
+      <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 class="form-group">
+      <label for="{{ form.circuits.id_for_label }}">Circuits</label>
+      {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
+    </div>
+    <div class="form-group">
+      <label for="{{ form.cores.id_for_label }}">Cores</label>
+      {% render_field form.cores|add_class:'form-control' value=object.cores %}
+    </div>
+    {% else %}
+    <dl>
+      <dt>Socket</dt>
+      <dd>{{ object.socket|default_if_none:'-' }}</dd>
+
+      <dt>Plug</dt>
+      <dd>{{ object.plug|default_if_none:'-' }}</dd>
+
+      <dt>Length</dt>
+      <dd>{{ object.length|default_if_none:'-' }}m</dd>
+
+      <dt>Cross Sectional Area</dt>
+      <dd>{{ object.csa|default_if_none:'-' }}m^2</dd>
+
+      <dt>Circuits</dt>
+      <dd>{{ object.circuits|default_if_none:'-' }}</dd>
+
+      <dt>Cores</dt>
+      <dd>{{ object.cores|default_if_none:'-' }}</dd>
+    </dl>
+    {% endif %}
+  </div>
+</div>
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 %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Collection Details
+  </div>
+  <div class="panel-body">
+    {% if edit or duplicate %}
+    <div class="form-group">
+      <label for="selectpicker">Set Parent</label>
+      {% include 'partials/asset_picker.html' %}
+    </div>
+    {% else %}
+    <dl>
+      <dt>Parent</dt>
+      <dd>
+        {% if object.parent %}
+        <a href="{% url 'asset_detail' object.parent.pk %}">
+        {{ object.parent.asset_id }} - {{ object.parent.description }}
+        </a>
+        {% else %}
+        <span>-</span>
+        {% endif %}
+      </dd>
+
+      <dt>Children</dt>
+      {% if object.asset_parent.all %}
+      {% for child in object.asset_parent.all %}
+      <dd>
+        <a href="{% url 'asset_detail' child.pk %}">
+        {{ child.asset_id }} - {{ child.description }}
+        </a>
+      </dd>
+      {% endfor %}
+      {% else %}
+      <dd><span>-</span></dd>
+      {% endif %}
+    </dl>
+    {% endif%}
+  </div>
+</div>
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 %}
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Purchase Details
+  </div>
+  <div class="panel-body">
+    {% if edit or duplicate %}
+    <div class="form-group">
+      <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
+      <select class="form-control" name="{{ form.purchased_from.name }}" id="{{ form.purchased_from.id_for_label }}">
+                {% for id, choice in form.purchased_from.field.choices %}
+                  <option value="{{ id }}"
+                  {% if object.purchased_from.id == id %}
+                    selected
+                  {% endif %}>
+                  {{ choice }}</option>
+                {% endfor %}
+              </select>
+    </div>
+
+    <div class="form-group">
+      <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
+      <div class="input-group">
+        <span class="input-group-addon">£</span>
+        {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
+      </div>
+    </div>
+
+    <div class="form-group">
+      <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
+      <div class="input-group">
+        <span class="input-group-addon">£</span>
+        {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
+      </div>
+    </div>
+
+    <div class="form-group">
+      <label for="{{ form.date_acquired.id_for_label }}" >Date Acquired</label>
+      {% 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 %}
+      <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
+                    class="form-control" id="id_date_acquired">
+                {% endif %}
+              </div>
+
+      <div class="form-group">
+        <label for="{{ form.date_sold.id_for_label }}">Date Sold</label>
+        {% 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 %}
+      </div>
+      {% else %}
+      <dl>
+        <dt>Purchased From</dt>
+        <dd>{{ object.purchased_from|default_if_none:'-' }}</dd>
+
+        <dt>Purchase Price</dt>
+        <dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
+
+        <dt>Salvage Value</dt>
+        <dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
+
+        <dt>Date Acquired</dt>
+        <dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
+        {% if object.date_sold %}
+        <dt>Date Sold</dt>
+        <dd>{{ object.date_sold|default_if_none:'-' }}</dd>
+        {% endif %}
+      </dl>
+      {% endif %}
+    </div>
+  </div>

From 1811cc98ba1e7ea764b3a36ae5bbfc4d67524557 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 8 Oct 2019 17:04:10 +0100
Subject: [PATCH 21/29] Oops. Create is an edit state...

---
 assets/templates/partials/asset_form.html           | 2 +-
 assets/templates/partials/cable_form.html           | 2 +-
 assets/templates/partials/parent_form.html          | 2 +-
 assets/templates/partials/purchasedetails_form.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/templates/partials/asset_form.html b/assets/templates/partials/asset_form.html
index c4b17ed1..0de1a72b 100644
--- a/assets/templates/partials/asset_form.html
+++ b/assets/templates/partials/asset_form.html
@@ -5,7 +5,7 @@
     Asset Details
   </div>
   <div class="panel-body">
-    {% if edit or duplicate %}
+    {% if create or edit or duplicate %}
     <div class="form-group">
         <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
         {% if duplicate %}
diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html
index 3d64fe42..40ccff89 100644
--- a/assets/templates/partials/cable_form.html
+++ b/assets/templates/partials/cable_form.html
@@ -5,7 +5,7 @@
     Cable Details
   </div>
   <div class="panel-body">
-    {% if edit or duplicate %}
+    {% if create or edit or duplicate %}
     <div class="form-group">
       <label for="{{ form.plug.id_for_label }}">Plug</label>
       <select name="{{ form.plug.name }}" id="{{ form.plug.id_for_label }}" class="form-control">
diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html
index c5853c41..10435818 100644
--- a/assets/templates/partials/parent_form.html
+++ b/assets/templates/partials/parent_form.html
@@ -5,7 +5,7 @@
     Collection Details
   </div>
   <div class="panel-body">
-    {% if edit or duplicate %}
+    {% if create or edit or duplicate %}
     <div class="form-group">
       <label for="selectpicker">Set Parent</label>
       {% include 'partials/asset_picker.html' %}
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
index 477b9e04..abfb2b26 100644
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -5,7 +5,7 @@
     Purchase Details
   </div>
   <div class="panel-body">
-    {% if edit or duplicate %}
+    {% if create or edit or duplicate %}
     <div class="form-group">
       <label for="{{ form.purchased_from.id_for_label }}">Purchased From</label>
       <select class="form-control" name="{{ form.purchased_from.name }}" id="{{ form.purchased_from.id_for_label }}">

From dc68a1f808abf92a228ac0b05c9ef3ac51e5c620 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 8 Oct 2019 17:51:33 +0100
Subject: [PATCH 22/29] Improve handling of really long strings

Partially resolves #350, my table fix/hack doesn't work on mobile.
---
 assets/templates/asset_update.html                   | 4 ++--
 assets/templates/partials/asset_form.html            | 4 ++--
 assets/templates/partials/asset_list_table_body.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 90e264e9..63a220a7 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -9,9 +9,9 @@
 <div class="page-header">
   <h1>
       {% if edit and object %}
-          Edit Asset: {{ object.asset_id }} - {{ object.description }}
+          Edit Asset: {{ object.asset_id }}
       {% else %}
-          Asset: {{ object.asset_id }} - {{ object.description }}
+          Asset: {{ object.asset_id }}
       {% endif %}
   </h1>
 </div>
diff --git a/assets/templates/partials/asset_form.html b/assets/templates/partials/asset_form.html
index 0de1a72b..86c2c7a4 100644
--- a/assets/templates/partials/asset_form.html
+++ b/assets/templates/partials/asset_form.html
@@ -57,7 +57,7 @@
     <dd>{{ object.asset_id }}</dd>
 
     <dt>Description</dt>
-    <dd>{{ object.description }}</dd>
+    <dd style="overflow-wrap: break-word;">{{ object.description }}</dd>
 
     <dt>Category</dt>
     <dd>{{ object.category }}</dd>
@@ -69,7 +69,7 @@
     <dd>{{ object.serial_number|default:'-' }}</dd>
 
     <dt>Comments</dt>
-    <dd>{{ object.comments|default:'-'|linebreaksbr }}</dd>
+    <dd style="overflow-wrap: break-word;">{{ object.comments|default:'-'|linebreaksbr }}</dd>
     {% endif %}
   </div>
 </div>
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index 523e99e1..1eea6a73 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -12,7 +12,7 @@
                 {% endif %}
                 ">
         <td style="vertical-align: middle;"><a href="{% url 'asset_detail' item.pk %}">{{ item.asset_id }}</a></td>
-        <td style="vertical-align: middle;">{{ item.description }}</td>
+        <td style="vertical-align: middle; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; max-width: 25vw">{{ item.description }}</td>
         <td style="vertical-align: middle;">{{ item.category }}</td>
         <td style="vertical-align: middle;">{{ item.status }}</td>
         <td>

From 5c9d7466c2d8c3742f07438cb88a0fee8d7241b8 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 8 Oct 2019 18:01:15 +0100
Subject: [PATCH 23/29] Change asset buttons - added cancel button, moved stuff

---
 assets/templates/partials/asset_buttons.html | 43 ++++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index 606a9bd7..e2ead5b9 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -1,20 +1,27 @@
+{% if edit and object %}
+<!--edit-->
+<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
+<a class="btn btn-default" href="{% url 'asset_update' object.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+<a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
+{% elif duplicate %}
+<!--duplicate-->
+<button type="submit" class="btn btn-default"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
+{% elif create %}
+<!--create-->
+<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
+{% else %}
+<!--detail view-->
 <div class="btn-group">
-  {% if edit and object %}
-  <!--edit-->
-  <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-  <a class="btn btn-default" href="{% url 'asset_update' object.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-  <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
-  {% elif duplicate %}
-  <!--duplicate-->
-  <button type="submit" class="btn btn-default"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
-  <a href="{% url 'asset_detail' previous_asset_pk %}" class="btn btn-warning"><i class="glyphicon glyphicon-remove"></i> Cancel</a>
-  {% elif create %}
-  <!--create-->
-  <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-  {% else %}
-  <!--detail view-->
-  <a href="{% url 'asset_update' object.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-  <a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-  <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
-  {% endif %}
+    <a href="{% url 'asset_update' object.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+    <a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+    <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</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_pk %}
+{%else%}
+history.back(){%endif%}">Cancel</button>
+{% endif %}

From 1d6208414f75402c4ca6db5a31f089b9fff45b52 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 8 Oct 2019 18:32:49 +0100
Subject: [PATCH 24/29] Fix old duplicate link

---
 assets/templates/partials/asset_buttons.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index e2ead5b9..14873409 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -1,7 +1,7 @@
 {% if edit and object %}
 <!--edit-->
 <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-<a class="btn btn-default" href="{% url 'asset_update' object.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+<a class="btn btn-default" href="{% url 'asset_detail' previous_asset_pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
 <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
 {% elif duplicate %}
 <!--duplicate-->

From b7e14b7dc394155610bc9d422374fafd96d9c243 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Tue, 8 Oct 2019 22:33:41 +0100
Subject: [PATCH 25/29] Added form validation * Asset IDs must be unique *
 Asset IDs that are legacy and unchange have no validation applied * Asset IDs
 must be alphanumeric * Values must be >=0 * Lengths, CSAs, Circuits and Cores
 of cables must all be >0

---
 RIGS/migrations/0035_auto_20191008_2148.py   | 18 +++++++
 assets/forms.py                              | 57 ++++++++++++++++++--
 assets/migrations/0009_auto_20191008_2148.py | 18 +++++++
 assets/models.py                             |  2 +-
 assets/views.py                              |  1 -
 5 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 RIGS/migrations/0035_auto_20191008_2148.py
 create mode 100644 assets/migrations/0009_auto_20191008_2148.py

diff --git a/RIGS/migrations/0035_auto_20191008_2148.py b/RIGS/migrations/0035_auto_20191008_2148.py
new file mode 100644
index 00000000..756ceac5
--- /dev/null
+++ b/RIGS/migrations/0035_auto_20191008_2148.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.13 on 2019-10-08 20:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0034_event_risk_assessment_edit_url'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='risk_assessment_edit_url',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='risk assessment'),
+        ),
+    ]
diff --git a/assets/forms.py b/assets/forms.py
index e33c87ec..a6c33c8e 100644
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -1,16 +1,12 @@
 from django import forms
 from django.core.exceptions import ValidationError
+import re
 
 from assets import models
 
 
 class AssetForm(forms.ModelForm):
     
-
-    def clean_date_sold(self):
-        if self.cleaned_data["date_sold"] and self.cleaned_data["date_acquired"] > self.cleaned_data["date_sold"]:
-            raise ValidationError("Cannot sell an item before it is acquired")
-        return self.cleaned_data["date_sold"]
     
     class Meta:
         model = models.Asset
@@ -19,10 +15,61 @@ class AssetForm(forms.ModelForm):
             'is_cable' : forms.CheckboxInput()
         }
 
+    def clean_date_sold(self):
+        if self.cleaned_data["date_sold"] and self.cleaned_data["date_acquired"] > self.cleaned_data["date_sold"]:
+            raise ValidationError("Cannot sell an item before it is acquired")
+        return self.cleaned_data["date_sold"]
+    
+    def clean_asset_id(self):
+        # If the asset ID has been changed
+        if self.instance.asset_id and self.instance.asset_id == self.cleaned_data["asset_id"]: #If the item was not changed
+            return self.cleaned_data["asset_id"]
+        else:
+            if re.search("^[a-zA-Z0-9]+$", self.cleaned_data["asset_id"]) == None:
+                raise ValidationError("An Asset ID can only consist of letters and numbers")
+            return self.cleaned_data["asset_id"]
+
+    def clean_purchase_price(self):
+        purchase_price = self.cleaned_data["purchase_price"]
+        if purchase_price and purchase_price < 0:
+            raise ValidationError("A price cannot be negative")
+        return purchase_price
+
+    def clean_salvage_value(self):
+        salvage_value = self.cleaned_data["salvage_value"]
+        if salvage_value and salvage_value < 0:
+            raise ValidationError("A price cannot be negative")
+        return salvage_value
+
+
 class CableForm(AssetForm):
     class Meta(AssetForm.Meta):
         model = models.Cable
 
+    def clean_length(self):
+        length = self.cleaned_data["length"]
+        if length <= 0:
+            raise ValidationError("The length of a cable must be more than 0")
+        return length
+
+    def clean_csa(self):
+        csa = self.cleaned_data["csa"]
+        if csa <= 0:
+            raise ValidationError("The CSA of a cable must be more than 0")
+        return csa
+
+    def clean_circuits(self):
+        circuits = self.cleaned_data["circuits"]
+        if circuits <= 0:
+            raise ValidationError("There must be at least one circuit")
+        return circuits
+    
+    def clean_cores(self):
+        cores = self.cleaned_data["cores"]
+        if cores <= 0:
+            raise ValidationError("There must be at least one core")
+        return cores
+
 class SupplierForm(forms.Form):
     class Meta:
         model = models.Supplier
diff --git a/assets/migrations/0009_auto_20191008_2148.py b/assets/migrations/0009_auto_20191008_2148.py
new file mode 100644
index 00000000..cbb474cc
--- /dev/null
+++ b/assets/migrations/0009_auto_20191008_2148.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.13 on 2019-10-08 20:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0008_auto_20191002_1931'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='asset_id',
+            field=models.CharField(max_length=10, unique=True),
+        ),
+    ]
diff --git a/assets/models.py b/assets/models.py
index 37a57628..adeb2ced 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -40,7 +40,7 @@ class Supplier(models.Model):
 class Asset(PolymorphicModel):
 
     parent = models.ForeignKey(to='self', related_name='asset_parent', blank=True, null=True, on_delete=models.SET_NULL)
-    asset_id = models.CharField(max_length=10)
+    asset_id = models.CharField(max_length=10, unique=True)
     description = models.CharField(max_length=120)
     category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE)
     status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE)
diff --git a/assets/views.py b/assets/views.py
index 3791edbc..e05a5e5c 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -74,7 +74,6 @@ class AssetEdit(LoginRequiredMixin, generic.UpdateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['form'] = forms.AssetForm
         context['edit'] = True
 
         return context

From f5fc41ce30dcdfbe4f4431b3af79a96269d68fba Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Fri, 11 Oct 2019 13:30:22 +0100
Subject: [PATCH 26/29] Initial work on asset DB perms

Partial #352.
---
 RIGS/management/commands/generateSampleData.py  |  4 ++--
 assets/migrations/0010_auto_20191011_1322.py    | 17 +++++++++++++++++
 assets/models.py                                |  5 +++++
 assets/templates/asset_update.html              |  2 ++
 .../partials/asset_list_table_body.html         |  3 +++
 assets/urls.py                                  | 15 ++++++++-------
 6 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 assets/migrations/0010_auto_20191011_1322.py

diff --git a/RIGS/management/commands/generateSampleData.py b/RIGS/management/commands/generateSampleData.py
index 5263a030..e17e2ff4 100644
--- a/RIGS/management/commands/generateSampleData.py
+++ b/RIGS/management/commands/generateSampleData.py
@@ -121,8 +121,8 @@ class Command(BaseCommand):
         self.keyholder_group = Group.objects.create(name='Keyholders')
         self.finance_group = Group.objects.create(name='Finance')
 
-        keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue"]
-        financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person"]
+        keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue", "add_asset", "change_asset", "delete_asset", "asset_finance"]
+        financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person", "asset_finance", "change_asset"]
 
         for permId in keyholderPerms:
             self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
diff --git a/assets/migrations/0010_auto_20191011_1322.py b/assets/migrations/0010_auto_20191011_1322.py
new file mode 100644
index 00000000..919c8466
--- /dev/null
+++ b/assets/migrations/0010_auto_20191011_1322.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.13 on 2019-10-11 12:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0009_auto_20191008_2148'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='asset',
+            options={'permissions': (('asset_finance', 'Can see financial data for assets'),)},
+        ),
+    ]
diff --git a/assets/models.py b/assets/models.py
index adeb2ced..d809f25e 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -62,6 +62,11 @@ class Asset(PolymorphicModel):
     def __str__(self):
         return str(self.asset_id) + ' - ' + self.description
 
+    class Meta:
+        permissions = (
+            ('asset_finance', 'Can see financial data for assets'),
+        )
+
 class Connector(models.Model):
     description = models.CharField(max_length=80)
     current_rating = models.DecimalField(decimal_places=2, max_digits=10, help_text='Amps')
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 63a220a7..39291814 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -32,9 +32,11 @@
     </div>
   </div>
   <div class="row">
+    {% if perms.asset.asset_financial %}
     <div class="col-md-6">
       {% include 'partials/purchasedetails_form.html' %}
     </div>
+    {% endif %}
     <div class="col-md-6" hidden="true" id="cable-table">
       {% include 'partials/cable_form.html' %}
     </div>
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index 1eea6a73..17012240 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -16,10 +16,13 @@
         <td style="vertical-align: middle;">{{ item.category }}</td>
         <td style="vertical-align: middle;">{{ item.status }}</td>
         <td>
+
             <div class="btn-group" role="group">
                 <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_detail' item.pk %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>
+                {% if perms.assets.change_asset %}
                 <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_update' item.pk %}"><i class="glyphicon glyphicon-edit"></i> Edit</a>
                 <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_update' item.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+                {% endif %}
             </div>
         </td>
     </tr>
diff --git a/assets/urls.py b/assets/urls.py
index 09c12047..d8d87ce1 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -2,25 +2,26 @@ from django.urls import path, include
 from rest_framework import routers
 from assets import views, api
 
+from PyRIGS.decorators import permission_required_with_403
+
 router = routers.DefaultRouter()
 router.register(r'api/assets', api.AssetViewSet)
 
 urlpatterns = [
-    # path('', views.Index.as_view(), name='index'),
     path('', views.AssetList.as_view(), name='index'),
     path('asset/list/', views.AssetList.as_view(), name='asset_list'),
     path('asset/<int:pk>/', views.AssetDetail.as_view(), name='asset_detail'),
-    path('asset/create/', views.AssetCreate.as_view(), name='asset_create'),
-    path('asset/<int:pk>/edit/', views.AssetEdit.as_view(), name='asset_update'),
-    path('asset/<int:pk>/duplicate/', views.AssetDuplicate.as_view(), name='asset_duplicate'),
-    path('asset/delete/', views.asset_delete, name='ajax_asset_delete'),
+    path('asset/create/', permission_required_with_403('assets.create_asset')(views.AssetCreate.as_view()), name='asset_create'),
+    path('asset/<int:pk>/edit/', permission_required_with_403('assets.change_asset')(views.AssetEdit.as_view()), name='asset_update'),
+    path('asset/<int:pk>/duplicate/', permission_required_with_403('assets.create_asset')(views.AssetDuplicate.as_view()), name='asset_duplicate'),
+    path('asset/delete/', permission_required_with_403('assets.delete_asset')(views.asset_delete), name='ajax_asset_delete'),
 
     path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
 
     path('supplier/list', views.SupplierList.as_view(), name='supplier_list'),
     path('supplier/<int:pk>', views.SupplierDetail.as_view(), name='supplier_detail'),
-    path('supplier/create', views.SupplierCreate.as_view(), name='supplier_create'),
-    path('supplier/<int:pk>/edit', views.SupplierUpdate.as_view(), name='supplier_update'),
+    path('supplier/create', permission_required_with_403('assets.create_supplier')(views.SupplierCreate.as_view()), name='supplier_create'),
+    path('supplier/<int:pk>/edit', permission_required_with_403('assets.edit_supplier')(views.SupplierUpdate.as_view()), name='supplier_update'),
 
     path('', include(router.urls)),
 ]

From aac900318eda3c79d1653c318c6e08bf4de648be Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Mon, 14 Oct 2019 00:05:18 +0100
Subject: [PATCH 27/29] Cables are now a thing, unfortunately by making a
 monolithic Asset model

Co-authored-by: Arona Jones <aj@aronajones.com>
---
 assets/admin.py                              |  5 --
 assets/forms.py                              | 60 --------------
 assets/migrations/0010_auto_20191013_2123.py | 67 +++++++++++++++
 assets/migrations/0011_auto_20191013_2247.py | 24 ++++++
 assets/models.py                             | 85 ++++++++++++++------
 assets/templates/asset_update.html           |  7 +-
 assets/templates/partials/asset_buttons.html |  2 +-
 assets/templates/partials/cable_form.html    |  4 +-
 assets/views.py                              | 27 +------
 9 files changed, 162 insertions(+), 119 deletions(-)
 create mode 100644 assets/migrations/0010_auto_20191013_2123.py
 create mode 100644 assets/migrations/0011_auto_20191013_2247.py

diff --git a/assets/admin.py b/assets/admin.py
index bbd7b2d0..7044040f 100644
--- a/assets/admin.py
+++ b/assets/admin.py
@@ -32,11 +32,6 @@ class ConnectorAdmin(admin.ModelAdmin):
     list_display = ['id', '__str__', 'current_rating', 'voltage_rating', 'num_pins']
 
 
-@admin.register(assets.Cable)
-class CableAdmin(admin.ModelAdmin):
-    pass
-
-
 admin.AdminSite.site_header = 'PyAssets - TEC\'s Asset System'
 admin.AdminSite.site_title = 'PyAssets Admin'
 admin.AdminSite.index_title = 'System Administration'
diff --git a/assets/forms.py b/assets/forms.py
index a6c33c8e..19e00b11 100644
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -1,74 +1,14 @@
 from django import forms
 from django.core.exceptions import ValidationError
-import re
 
 from assets import models
 
 
 class AssetForm(forms.ModelForm):
-    
-    
     class Meta:
         model = models.Asset
         fields = '__all__'
-        widgets = {
-            'is_cable' : forms.CheckboxInput()
-        }
 
-    def clean_date_sold(self):
-        if self.cleaned_data["date_sold"] and self.cleaned_data["date_acquired"] > self.cleaned_data["date_sold"]:
-            raise ValidationError("Cannot sell an item before it is acquired")
-        return self.cleaned_data["date_sold"]
-    
-    def clean_asset_id(self):
-        # If the asset ID has been changed
-        if self.instance.asset_id and self.instance.asset_id == self.cleaned_data["asset_id"]: #If the item was not changed
-            return self.cleaned_data["asset_id"]
-        else:
-            if re.search("^[a-zA-Z0-9]+$", self.cleaned_data["asset_id"]) == None:
-                raise ValidationError("An Asset ID can only consist of letters and numbers")
-            return self.cleaned_data["asset_id"]
-
-    def clean_purchase_price(self):
-        purchase_price = self.cleaned_data["purchase_price"]
-        if purchase_price and purchase_price < 0:
-            raise ValidationError("A price cannot be negative")
-        return purchase_price
-
-    def clean_salvage_value(self):
-        salvage_value = self.cleaned_data["salvage_value"]
-        if salvage_value and salvage_value < 0:
-            raise ValidationError("A price cannot be negative")
-        return salvage_value
-
-
-class CableForm(AssetForm):
-    class Meta(AssetForm.Meta):
-        model = models.Cable
-
-    def clean_length(self):
-        length = self.cleaned_data["length"]
-        if length <= 0:
-            raise ValidationError("The length of a cable must be more than 0")
-        return length
-
-    def clean_csa(self):
-        csa = self.cleaned_data["csa"]
-        if csa <= 0:
-            raise ValidationError("The CSA of a cable must be more than 0")
-        return csa
-
-    def clean_circuits(self):
-        circuits = self.cleaned_data["circuits"]
-        if circuits <= 0:
-            raise ValidationError("There must be at least one circuit")
-        return circuits
-    
-    def clean_cores(self):
-        cores = self.cleaned_data["cores"]
-        if cores <= 0:
-            raise ValidationError("There must be at least one core")
-        return cores
 
 class SupplierForm(forms.Form):
     class Meta:
diff --git a/assets/migrations/0010_auto_20191013_2123.py b/assets/migrations/0010_auto_20191013_2123.py
new file mode 100644
index 00000000..b56c40c4
--- /dev/null
+++ b/assets/migrations/0010_auto_20191013_2123.py
@@ -0,0 +1,67 @@
+# Generated by Django 2.0.13 on 2019-10-13 20:23
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0009_auto_20191008_2148'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cable',
+            name='asset_ptr',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='plug',
+        ),
+        migrations.RemoveField(
+            model_name='cable',
+            name='socket',
+        ),
+        migrations.AlterModelOptions(
+            name='asset',
+            options={},
+        ),
+        migrations.RemoveField(
+            model_name='asset',
+            name='polymorphic_ctype',
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='circuits',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='cores',
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='csa',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='mm^2', max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='length',
+            field=models.DecimalField(blank=True, decimal_places=1, help_text='m', max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='plug',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='plug', to='assets.Connector'),
+        ),
+        migrations.AddField(
+            model_name='asset',
+            name='socket',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='socket', to='assets.Connector'),
+        ),
+        migrations.DeleteModel(
+            name='Cable',
+        ),
+    ]
diff --git a/assets/migrations/0011_auto_20191013_2247.py b/assets/migrations/0011_auto_20191013_2247.py
new file mode 100644
index 00000000..af49b124
--- /dev/null
+++ b/assets/migrations/0011_auto_20191013_2247.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.0.13 on 2019-10-13 21:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0010_auto_20191013_2123'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='plug',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='plug', to='assets.Connector'),
+        ),
+        migrations.AlterField(
+            model_name='asset',
+            name='socket',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='socket', to='assets.Connector'),
+        ),
+    ]
diff --git a/assets/models.py b/assets/models.py
index adeb2ced..66646515 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -1,9 +1,10 @@
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
 from polymorphic.models import PolymorphicModel
 
 import datetime
-
+import re
 
 class AssetCategory(models.Model):
     class Meta:
@@ -37,7 +38,17 @@ class Supplier(models.Model):
         return self.name
 
 
-class Asset(PolymorphicModel):
+class Connector(models.Model):
+    description = models.CharField(max_length=80)
+    current_rating = models.DecimalField(decimal_places=2, max_digits=10, help_text='Amps')
+    voltage_rating = models.IntegerField(help_text='Volts')
+    num_pins = models.IntegerField(blank=True, null=True)
+
+    def __str__(self):
+        return self.description
+
+
+class Asset(models.Model):
 
     parent = models.ForeignKey(to='self', related_name='asset_parent', blank=True, null=True, on_delete=models.SET_NULL)
     asset_id = models.CharField(max_length=10, unique=True)
@@ -55,34 +66,56 @@ class Asset(PolymorphicModel):
 
     # Cable assets
     is_cable = models.BooleanField(default=False)
-
-    def get_absolute_url(self):
-        return reverse('asset_detail', kwargs={'pk': self.pk})
-
-    def __str__(self):
-        return str(self.asset_id) + ' - ' + self.description
-
-class Connector(models.Model):
-    description = models.CharField(max_length=80)
-    current_rating = models.DecimalField(decimal_places=2, max_digits=10, help_text='Amps')
-    voltage_rating = models.IntegerField(help_text='Volts')
-    num_pins = models.IntegerField(blank=True, null=True)
-
-    def __str__(self):
-        return self.description
-
-
-class Cable(Asset):
-    plug = models.ForeignKey(Connector, on_delete=models.SET_NULL, related_name='plug', null=True)
-    socket = models.ForeignKey(Connector, on_delete=models.SET_NULL, related_name='socket', null=True)
+    plug = models.ForeignKey(Connector, on_delete=models.SET_NULL, related_name='plug', blank=True, null=True)
+    socket = models.ForeignKey(Connector, on_delete=models.SET_NULL, related_name='socket', blank=True, null=True)
     length = models.DecimalField(decimal_places=1, max_digits=10, blank=True, null=True, help_text='m')
     csa = models.DecimalField(decimal_places=2, max_digits=10, blank=True, null=True, help_text='mm^2')
     circuits = models.IntegerField(blank=True, null=True)
     cores = models.IntegerField(blank=True, null=True)
 
-    def cable_resistance(self):
-        rho = 0.0000000168
-        return (rho * self.length) / (self.csa * 1000000)
+    def get_absolute_url(self):
+        return reverse('asset_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return '{} - {}m - {}'.format(self.plug, self.length, self.socket)
+        out = str(self.asset_id) + ' - ' + self.description
+        if self.is_cable:
+            out += '{} - {}m - {}'.format(self.plug, self.length, self.socket)
+        return out
+
+    def clean(self):
+        if self.date_sold and self.date_acquired > self.date_sold:
+            raise ValidationError({"date_sold": "Cannot sell an item before it is acquired"})
+
+        self.asset_id = self.asset_id.upper()
+        if re.search("^[a-zA-Z0-9]+$", self.asset_id) is None:
+                raise ValidationError({"asset_id": "An Asset ID can only consist of letters and numbers"})
+
+        if self.purchase_price and self.purchase_price < 0:
+            raise ValidationError({"purchase_price": "A price cannot be negative"})
+
+        if self.salvage_value and self.salvage_value < 0:
+            raise ValidationError({"purchase_price": "A price cannot be negative"})
+
+        if self.is_cable:
+            if self.length is None:
+                raise ValidationError({"length": "The length of a cable must be a number"})
+            elif self.csa is None:
+                raise ValidationError({"csa": "The csa of a cable must be a number"})
+            elif self.circuits is None:
+                raise ValidationError({"circuits": "The number of circuits in a cable must be a number"})
+            elif self.cores is None:
+                raise ValidationError({"cores": "The number of cores in a cable must be a number"})
+            elif self.socket is None:
+                raise ValidationError({"plug": "A cable must have a plug"})
+            elif self.plug is None:
+                raise ValidationError({"socket": "A cable must have a socket"})
+
+            if self.length <= 0:
+                raise ValidationError({"length": "The length of a cable must be more than 0"})
+            elif self.csa <= 0:
+                raise ValidationError({"csa": "The CSA of a cable must be more than 0"})
+            elif self.circuits <= 0:
+                raise ValidationError({"circuits": "There must be at least one circuit in a cable"})
+            elif self.cores <= 0:
+                raise ValidationError({"cores": "There must be at least one core in a cable"})
+ 
\ No newline at end of file
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 63a220a7..6c0159bc 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -35,7 +35,8 @@
     <div class="col-md-6">
       {% include 'partials/purchasedetails_form.html' %}
     </div>
-    <div class="col-md-6" hidden="true" id="cable-table">
+    <div class="col-md-6" 
+    {% if not object.is_cable %} hidden="true" {% endif %} id="cable-table">
       {% include 'partials/cable_form.html' %}
     </div>
     <div class="col-md-4">
@@ -54,6 +55,7 @@
 {% endblock %}
 
 {% block js%}
+{% if edit %}
 <script>
   function checkIfCableHidden() {
     if (document.getElementById("id_is_cable").checked) {
@@ -64,4 +66,5 @@
   }
   checkIfCableHidden();
 </script>
-{%endblock%}
+{% endif %}
+{% endblock %}
diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index 14873409..bf302351 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -1,7 +1,7 @@
 {% if edit and object %}
 <!--edit-->
 <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-<a class="btn btn-default" href="{% url 'asset_detail' previous_asset_pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+<a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
 <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
 {% elif duplicate %}
 <!--duplicate-->
diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html
index 40ccff89..246f4ee9 100644
--- a/assets/templates/partials/cable_form.html
+++ b/assets/templates/partials/cable_form.html
@@ -9,7 +9,7 @@
     <div class="form-group">
       <label for="{{ form.plug.id_for_label }}">Plug</label>
       <select name="{{ form.plug.name }}" id="{{ form.plug.id_for_label }}" class="form-control">
-                  <option value="None">
+                  <option value="">
                   {% for connector in connectors %}
                     <option value="{{ connector.pk }}">
                     {{ connector.description }}
@@ -20,7 +20,7 @@
     <div class="form-group">
       <label for="{{ form.socket.id_for_label }}">Socket</label>
       <select name="{{ form.socket.name }}" id="{{ form.socket.id_for_label }}" class="form-control">
-                  <option value="None">
+                  <option value="">
                   {% for connector in connectors %}
                     <option value="{{ connector.pk }}">
                     {{ connector.description }}
diff --git a/assets/views.py b/assets/views.py
index e05a5e5c..0d134603 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -47,7 +47,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
 
         context["statuses"] = models.AssetStatus.objects.all()
         context["status_select"] = self.request.GET.get('status', "")
-        return context;
+        return context
 
 class AssetSearch(AssetList):
     def render_to_response(self, context, **response_kwargs):
@@ -62,30 +62,18 @@ class AssetDetail(LoginRequiredMixin, generic.DetailView):
     model = models.Asset
     template_name = 'asset_update.html'
 
-
-# class AssetCreate(LoginRequiredMixin, generic.TemplateView):
-#     fields = '__all__'
-#     template_name = 'asset_update.html'
-#     # success_url = reverse_lazy('asset_list')
-
 class AssetEdit(LoginRequiredMixin, generic.UpdateView):
     template_name = 'asset_update.html'
     model = models.Asset
+    form_class = forms.AssetForm
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['edit'] = True
+        context["connectors"] = models.Connector.objects.all()
 
         return context
 
-    def get_form_class(self):
-        if self.object.is_cable:
-            return forms.CableForm
-        return forms.AssetForm
-
-    def form_invalid(self, form):
-        return super().form_invalid(form)
-
     def get_success_url(self):
         return reverse("asset_detail", kwargs={"pk":self.object.id})
 
@@ -99,16 +87,9 @@ class AssetCreate(LoginRequiredMixin, generic.CreateView):
         
         context["create"] = True
         context["connectors"] = models.Connector.objects.all()
+
         return context
     
-    def get_form_class(self):
-        if self.request.method == "POST":
-            if 'is_cable' in self.request.POST:
-                return forms.CableForm
-            return forms.AssetForm
-        else:
-            return forms.CableForm #For GET, so that all form fields can be placed
-    
     def get_success_url(self):
         return reverse("asset_detail", kwargs={"pk":self.object.id})
 

From 743d290405f83601526a1e59fadfa6393dae8526 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Mon, 14 Oct 2019 00:19:38 +0100
Subject: [PATCH 28/29] Assets are now ordered by asset_id. Fixes #355

---
 assets/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/models.py b/assets/models.py
index a43dc839..193b7642 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -50,6 +50,7 @@ class Connector(models.Model):
 
 class Asset(models.Model):
     class Meta:
+        ordering = ['asset_id']
         permissions = (
             ('asset_finance', 'Can see financial data for assets'),
         )

From 85a20dac263ca4c4ea9b3d21bf50e631f9cbc848 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Mon, 14 Oct 2019 14:07:06 +0100
Subject: [PATCH 29/29] Assets now conforms to pep8

---
 RIGS/forms.py                                 |  1 +
 .../management/commands/generateSampleData.py | 15 ++++++++--
 RIGS/rigboard.py                              |  2 ++
 RIGS/views.py                                 |  2 +-
 .../management/commands/createSampleData.py   | 13 +++++----
 assets/models.py                              |  4 +--
 assets/urls.py                                |  1 -
 assets/views.py                               | 29 ++++++++++++-------
 8 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/RIGS/forms.py b/RIGS/forms.py
index 9caf3016..18a81e14 100644
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -39,6 +39,7 @@ class EmbeddedAuthenticationForm(AuthenticationForm):
         super().__init__(*args, **kwargs)
         self.fields['username'].widget.attrs.pop('autofocus', None)
 
+
 class PasswordReset(PasswordResetForm):
     captcha = ReCaptchaField(label='Captcha')
 
diff --git a/RIGS/management/commands/generateSampleData.py b/RIGS/management/commands/generateSampleData.py
index e17e2ff4..3c82fe57 100644
--- a/RIGS/management/commands/generateSampleData.py
+++ b/RIGS/management/commands/generateSampleData.py
@@ -121,8 +121,19 @@ class Command(BaseCommand):
         self.keyholder_group = Group.objects.create(name='Keyholders')
         self.finance_group = Group.objects.create(name='Finance')
 
-        keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue", "add_asset", "change_asset", "delete_asset", "asset_finance"]
-        financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person", "asset_finance", "change_asset"]
+        keyholderPerms = ["add_event", "change_event", "view_event",
+                          "add_eventitem", "change_eventitem", "delete_eventitem",
+                          "add_organisation", "change_organisation", "view_organisation",
+                          "add_person", "change_person", "view_person", "view_profile",
+                          "add_venue", "change_venue", "view_venue",
+                          "add_asset", "change_asset", "delete_asset",
+                          "asset_finance"]
+        financePerms = ["change_event", "view_event", "add_eventitem",
+                        "change_eventitem", "add_invoice", "change_invoice", "view_invoice",
+                        "add_organisation", "change_organisation", "view_organisation",
+                        "add_payment", "change_payment", "delete_payment",
+                        "add_person", "change_person", "view_person",
+                        "asset_finance", "change_asset"]
 
         for permId in keyholderPerms:
             self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py
index e6112b31..99c80601 100644
--- a/RIGS/rigboard.py
+++ b/RIGS/rigboard.py
@@ -83,6 +83,7 @@ class EventEmbed(EventDetail):
 
 class EventRA(generic.base.RedirectView):
     permanent = False
+
     def get_redirect_url(self, *args, **kwargs):
         event = get_object_or_404(models.Event, pk=kwargs['pk'])
 
@@ -406,6 +407,7 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
         context['to_name'] = self.request.GET.get('to_name', None)
         return context
 
+
 @method_decorator(csrf_exempt, name='dispatch')
 class LogRiskAssessment(generic.View):
     http_method_names = ["post"]
diff --git a/RIGS/views.py b/RIGS/views.py
index aaaac7da..b197334c 100644
--- a/RIGS/views.py
+++ b/RIGS/views.py
@@ -62,7 +62,7 @@ def login_embed(request, **kwargs):
                 messages.warning(request, 'Cookies do not seem to be enabled. Try logging in using a new tab.')
                 request.method = 'GET'  # Render the page without trying to login
 
-        return login(request, template_name="registration/login_embed.html", authentication_form=forms.EmbeddedAuthenticationForm) 
+        return login(request, template_name="registration/login_embed.html", authentication_form=forms.EmbeddedAuthenticationForm)
 
 
 """
diff --git a/assets/management/commands/createSampleData.py b/assets/management/commands/createSampleData.py
index d054b17d..616cff7c 100644
--- a/assets/management/commands/createSampleData.py
+++ b/assets/management/commands/createSampleData.py
@@ -36,7 +36,8 @@ class Command(BaseCommand):
             models.AssetStatus.objects.create(name=stat)
 
     def create_suppliers(self):
-        suppliers = ["Acme, inc.","Widget Corp","123 Warehousing","Demo Company","Smith and Co.","Foo Bars","ABC Telecom","Fake Brothers","QWERTY Logistics","Demo, inc.","Sample Company","Sample, inc","Acme Corp","Allied Biscuit","Ankh-Sto Associates","Extensive Enterprise","Galaxy Corp","Globo-Chem","Mr. Sparkle","Globex Corporation","LexCorp","LuthorCorp","North Central Positronics","Omni Consimer Products","Praxis Corporation","Sombra Corporation","Sto Plains Holdings","Tessier-Ashpool","Wayne Enterprises","Wentworth Industries","ZiffCorp","Bluth Company","Strickland Propane","Thatherton Fuels","Three Waters","Water and Power","Western Gas & Electric","Mammoth Pictures","Mooby Corp","Gringotts","Thrift Bank","Flowers By Irene","The Legitimate Businessmens Club","Osato Chemicals","Transworld Consortium","Universal Export","United Fried Chicken","Virtucon","Kumatsu Motors","Keedsler Motors","Powell Motors","Industrial Automation","Sirius Cybernetics Corporation","U.S. Robotics and Mechanical Men","Colonial Movers","Corellian Engineering Corporation","Incom Corporation","General Products","Leeding Engines Ltd.","Blammo","Input, Inc.","Mainway Toys","Videlectrix","Zevo Toys","Ajax","Axis Chemical Co.","Barrytron","Carrys Candles","Cogswell Cogs","Spacely Sprockets","General Forge and Foundry","Duff Brewing Company","Dunder Mifflin","General Services Corporation","Monarch Playing Card Co.","Krustyco","Initech","Roboto Industries","Primatech","Sonky Rubber Goods","St. Anky Beer","Stay Puft Corporation","Vandelay Industries","Wernham Hogg","Gadgetron","Burleigh and Stronginthearm","BLAND Corporation","Nordyne Defense Dynamics","Petrox Oil Company","Roxxon","McMahon and Tate","Sixty Second Avenue","Charles Townsend Agency","Spade and Archer","Megadodo Publications","Rouster and Sideways","C.H. Lavatory and Sons","Globo Gym American Corp","The New Firm","SpringShield","Compuglobalhypermeganet","Data Systems","Gizmonic Institute","Initrode","Taggart Transcontinental","Atlantic Northern","Niagular","Plow King","Big Kahuna Burger","Big T Burgers and Fries","Chez Quis","Chotchkies","The Frying Dutchman","Klimpys","The Krusty Krab","Monks Diner","Milliways","Minuteman Cafe","Taco Grande","Tip Top Cafe","Moes Tavern","Central Perk","Chasers"]
+        suppliers = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",
+                     "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]
 
         for supplier in suppliers:
             models.Supplier.objects.create(name=supplier)
@@ -64,11 +65,11 @@ class Command(BaseCommand):
 
     def create_connectors(self):
         connectors = [
-            { "description":"13A UK", "current_rating":13, "voltage_rating":230, "num_pins":3 },
-            { "description":"16A", "current_rating":16, "voltage_rating":230, "num_pins":3 },
-            { "description":"32/3", "current_rating":32, "voltage_rating":400, "num_pins":5 },
-            { "description":"Socapex", "current_rating":23, "voltage_rating":600, "num_pins":19 },
+            {"description": "13A UK", "current_rating": 13, "voltage_rating": 230, "num_pins": 3},
+            {"description": "16A", "current_rating": 16, "voltage_rating": 230, "num_pins": 3},
+            {"description": "32/3", "current_rating": 32, "voltage_rating": 400, "num_pins": 5},
+            {"description": "Socapex", "current_rating": 23, "voltage_rating": 600, "num_pins": 19},
         ]
         for connector in connectors:
             conn = models.Connector.objects.create(**connector)
-            conn.save()
\ No newline at end of file
+            conn.save()
diff --git a/assets/models.py b/assets/models.py
index 193b7642..005beadd 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -6,6 +6,7 @@ from polymorphic.models import PolymorphicModel
 import datetime
 import re
 
+
 class AssetCategory(models.Model):
     class Meta:
         verbose_name = 'Asset Category'
@@ -54,7 +55,7 @@ class Asset(models.Model):
         permissions = (
             ('asset_finance', 'Can see financial data for assets'),
         )
-    
+
     parent = models.ForeignKey(to='self', related_name='asset_parent', blank=True, null=True, on_delete=models.SET_NULL)
     asset_id = models.CharField(max_length=10, unique=True)
     description = models.CharField(max_length=120)
@@ -123,4 +124,3 @@ class Asset(models.Model):
                 raise ValidationError({"circuits": "There must be at least one circuit in a cable"})
             elif self.cores <= 0:
                 raise ValidationError({"cores": "There must be at least one core in a cable"})
- 
\ No newline at end of file
diff --git a/assets/urls.py b/assets/urls.py
index d8d87ce1..c7dcf2fc 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -25,4 +25,3 @@ urlpatterns = [
 
     path('', include(router.urls)),
 ]
-
diff --git a/assets/views.py b/assets/views.py
index 0d134603..c706f949 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -13,14 +13,15 @@ from dateutil import parser
 import simplejson as json
 from assets import models, forms
 
+
 class AssetList(LoginRequiredMixin, generic.ListView):
     model = models.Asset
     template_name = 'asset_list.html'
     paginate_by = 40
     ordering = ['-pk']
-        
+
     def get_queryset(self):
-        #TODO Feedback to user when search fails
+        # TODO Feedback to user when search fails
         query = self.request.GET.get('query', "")
         if len(query) == 0:
             queryset = self.model.objects.all()
@@ -28,7 +29,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
             queryset = self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
         else:
             queryset = self.model.objects.filter(Q(asset_id__exact=query))
-        
+
         cat = self.request.GET.get('cat', "")
         status = self.request.GET.get('status', "")
         if cat != "":
@@ -37,7 +38,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
             queryset = queryset.filter(status__name__exact=status)
 
         return queryset
-    
+
     def get_context_data(self, **kwargs):
         context = super(AssetList, self).get_context_data(**kwargs)
         context["search_name"] = self.request.GET.get('query', "")
@@ -49,19 +50,22 @@ class AssetList(LoginRequiredMixin, generic.ListView):
         context["status_select"] = self.request.GET.get('status', "")
         return context
 
+
 class AssetSearch(AssetList):
     def render_to_response(self, context, **response_kwargs):
         result = []
 
         for asset in context["object_list"]:
-            result.append({"id":asset.pk, "label":(asset.asset_id + " | " + asset.description)})
-        
+            result.append({"id": asset.pk, "label": (asset.asset_id + " | " + asset.description)})
+
         return JsonResponse(result, safe=False)
 
+
 class AssetDetail(LoginRequiredMixin, generic.DetailView):
     model = models.Asset
     template_name = 'asset_update.html'
 
+
 class AssetEdit(LoginRequiredMixin, generic.UpdateView):
     template_name = 'asset_update.html'
     model = models.Asset
@@ -75,7 +79,8 @@ class AssetEdit(LoginRequiredMixin, generic.UpdateView):
         return context
 
     def get_success_url(self):
-        return reverse("asset_detail", kwargs={"pk":self.object.id})
+        return reverse("asset_detail", kwargs={"pk": self.object.id})
+
 
 class AssetCreate(LoginRequiredMixin, generic.CreateView):
     template_name = 'asset_create.html'
@@ -84,14 +89,15 @@ class AssetCreate(LoginRequiredMixin, generic.CreateView):
 
     def get_context_data(self, **kwargs):
         context = super(AssetCreate, self).get_context_data(**kwargs)
-        
+
         context["create"] = True
         context["connectors"] = models.Connector.objects.all()
 
         return context
-    
+
     def get_success_url(self):
-        return reverse("asset_detail", kwargs={"pk":self.object.id})
+        return reverse("asset_detail", kwargs={"pk": self.object.id})
+
 
 class DuplicateMixin:
     def get(self, request, *args, **kwargs):
@@ -99,6 +105,7 @@ class DuplicateMixin:
         self.object.pk = None
         return self.render_to_response(self.get_context_data())
 
+
 class AssetDuplicate(DuplicateMixin, AssetCreate):
     model = models.Asset
 
@@ -110,6 +117,7 @@ class AssetDuplicate(DuplicateMixin, AssetCreate):
         context["previous_asset_pk"] = self.kwargs.get(self.pk_url_kwarg)
         return context
 
+
 @login_required()
 def asset_delete(request):
     context = dict()
@@ -121,6 +129,7 @@ def asset_delete(request):
 
         return HttpResponse(json.dumps(context), content_type='application/json')
 
+
 class SupplierList(generic.ListView):
     model = models.Supplier
     template_name = 'supplier_list.html'