From 88b34740f6cff5e479194bef95841659c31af1b6 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 16 Mar 2020 21:45:04 +0000
Subject: [PATCH] Asset list/CRUD template updates

---
 RIGS/templates/rigboard.html                  |  2 +-
 assets/templates/asset_create.html            | 60 ----------------
 assets/templates/asset_detail.html            | 34 +++++++++
 assets/templates/asset_form.html              | 70 +++++++++++++++++++
 assets/templates/asset_list.html              |  2 +
 assets/templates/asset_update.html            | 70 -------------------
 ...asset_form.html => asset_detail_form.html} |  6 +-
 assets/templates/partials/asset_picker.html   | 17 +----
 assets/templates/partials/cable_form.html     |  6 +-
 assets/templates/partials/parent_form.html    |  6 +-
 .../partials/purchasedetails_form.html        | 23 +-----
 assets/views.py                               | 10 ++-
 templates/base_assets.html                    |  2 +-
 13 files changed, 126 insertions(+), 182 deletions(-)
 delete mode 100644 assets/templates/asset_create.html
 create mode 100644 assets/templates/asset_detail.html
 create mode 100644 assets/templates/asset_form.html
 delete mode 100644 assets/templates/asset_update.html
 rename assets/templates/partials/{asset_form.html => asset_detail_form.html} (96%)

diff --git a/RIGS/templates/rigboard.html b/RIGS/templates/rigboard.html
index bb00eafc..9f91fe98 100644
--- a/RIGS/templates/rigboard.html
+++ b/RIGS/templates/rigboard.html
@@ -6,7 +6,7 @@
     <div>
         <h1 class="bd-title">Rigboard</h1>
         {% if perms.RIGS.add_event %}
-        <a href="{% url 'event_create' %}" class="btn btn-lg btn-outline-primary float-right">New <span class="fas fa-plus"></span></a>
+        <a href="{% url 'event_create' %}" class="btn btn-outline-primary float-right my-3">New <i class="fas fa-plus"></i></a>
         {% endif %}
     </div>
     {% include 'event_table.html' %}
diff --git a/assets/templates/asset_create.html b/assets/templates/asset_create.html
deleted file mode 100644
index 14b4b66a..00000000
--- a/assets/templates/asset_create.html
+++ /dev/null
@@ -1,60 +0,0 @@
-{% extends 'base_assets.html' %}
-{% load widget_tweaks %}
-{% 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_id%}">
-  {% else %}
-  <form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
-    {% endif %}
-    {% include 'form_errors.html' %}
-    {% csrf_token %}
-    <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-    <div class="row">
-      <div class="col-sm-12">
-        {% include 'partials/asset_form.html' %}
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-6">
-        {% 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>
-
-  {% 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/asset_detail.html b/assets/templates/asset_detail.html
new file mode 100644
index 00000000..34d47af9
--- /dev/null
+++ b/assets/templates/asset_detail.html
@@ -0,0 +1,34 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+{% block title %}Asset {{ object.asset_id }}{% endblock %}
+
+{% block content %}
+
+<div class="page-header">
+  <h1>Asset: {{ object.asset_id }}</h1>
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+    {% include 'partials/asset_detail_form.html' %}
+    </div>
+</div>
+<div class="row">
+    {% if perms.assets.asset_finance %}
+    <div class="col-md-6">
+      {% include 'partials/purchasedetails_form.html' %}
+    </div>
+    {% endif %}
+    <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">
+      {% include 'partials/parent_form.html' %}
+    </div>
+</div>
+<div class="row">
+<div class="col-md-12">
+  {% include 'partials/asset_buttons.html' %}
+</div>
+{% include 'partials/last_edited.html' with target="asset_history" %}
+{% endblock %}
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
new file mode 100644
index 00000000..4797d327
--- /dev/null
+++ b/assets/templates/asset_form.html
@@ -0,0 +1,70 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+{% load static %}
+
+{% block title %}Asset {{ object.asset_id }}{% endblock %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static "css/bootstrap-select.css" %}"/>
+    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+{% endblock %}
+
+{% block js %}
+    <script src="{% static "js/bootstrap-select.js" %}"></script>
+    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+    <script src="{% static "js/autocomplete.js" %}"></script>
+    <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 %}
+
+{% block content %}
+<div class="page-header">
+  <h1>
+      {% if edit and object %}
+          Edit Asset: {{ object.asset_id }}
+      {% elif 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_id %}">
+{% else %}
+    <form method="post" id="asset_update_form" action="{% url 'asset_create' %}">
+{% endif %}
+        {% include 'form_errors.html' %}
+        {% csrf_token %}
+        <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
+        <div class="row">
+          <div class="col-sm-12">
+            {% include 'partials/asset_detail_form.html' %}
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-6">
+            {% 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>
+{% endblock %}
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index b4fbf3ce..6c04b56d 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -41,6 +41,8 @@
   </div>
 </form>
 
+<a href="{% url 'asset_create' %}" class="btn btn-outline-primary float-right my-3">New <i class="fas fa-plus"></i></a>
+
 <table class="table">
   <thead>
     <tr>
diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
deleted file mode 100644
index 4f576130..00000000
--- a/assets/templates/asset_update.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% extends 'base_assets.html' %}
-{% load widget_tweaks %}
-{% block title %}Asset {{ object.asset_id }}{% endblock %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1>
-      {% if edit and object %}
-          Edit Asset: {{ object.asset_id }}
-      {% else %}
-          Asset: {{ object.asset_id }}
-      {% endif %}
-  </h1>
-</div>
-<form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.asset_id%}">
-  {% include 'form_errors.html' %}
-  {% csrf_token %}
-  <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-  <div class="row">
-    <div class="col-sm-12">
-      {% include 'partials/asset_form.html' %}
-    </div>
-  </div>
-  <div class="row">
-    {% if perms.assets.asset_finance %}
-    <div class="col-md-6">
-      {% include 'partials/purchasedetails_form.html' %}
-    </div>
-    {%endif%}
-    <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">
-      {% include 'partials/parent_form.html' %}
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-12">
-      {% include 'partials/asset_buttons.html' %}
-  </div>
-</form>
-
-{% if not edit and perms.assets.view_asset %}
-<div class="col-sm-12 text-right">
-    <div>
-        <a href="{% url 'asset_history' object.asset_id %}" title="View Revision History">
-            Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
-        </a>
-    </div>
-</div>
-{% endif %}
-
-{% endblock %}
-
-{% block js%}
-{% if edit %}
-<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>
-{% endif %}
-{% endblock %}
diff --git a/assets/templates/partials/asset_form.html b/assets/templates/partials/asset_detail_form.html
similarity index 96%
rename from assets/templates/partials/asset_form.html
rename to assets/templates/partials/asset_detail_form.html
index 45424992..cb55e677 100644
--- a/assets/templates/partials/asset_form.html
+++ b/assets/templates/partials/asset_detail_form.html
@@ -1,9 +1,9 @@
 {% load widget_tweaks %}
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     Asset Details
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     {% if create or edit or duplicate %}
     <div class="form-group">
         <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
diff --git a/assets/templates/partials/asset_picker.html b/assets/templates/partials/asset_picker.html
index fd63fe86..5e9e076f 100644
--- a/assets/templates/partials/asset_picker.html
+++ b/assets/templates/partials/asset_picker.html
@@ -3,20 +3,7 @@
     <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 %}
-{{ js.super }}
 <script>
 $('#parent_id')
     .selectpicker({
@@ -56,10 +43,10 @@ $('#parent_id')
                     'text': "No parent"
                 });
             }
-            
+
             return assets;
         },
         preserveSelected: false
     });
 </script>
-{% endblock js %}
\ No newline at end of file
+{% endblock js %}
diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html
index e5deb006..8b15ef09 100644
--- a/assets/templates/partials/cable_form.html
+++ b/assets/templates/partials/cable_form.html
@@ -1,9 +1,9 @@
 {% load widget_tweaks %}
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     Cable Details
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     {% if create or edit or duplicate %}
     <div class="form-group">
       <label for="{{ form.plug.id_for_label }}">Plug</label>
diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html
index f252db36..f2c54def 100644
--- a/assets/templates/partials/parent_form.html
+++ b/assets/templates/partials/parent_form.html
@@ -1,9 +1,9 @@
 {% load widget_tweaks %}
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     Collection Details
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     {% if create or edit or duplicate %}
     <div class="form-group" id="parent-group">
       <label for="selectpicker">Set Parent</label>
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
index a19dfa1f..9cbe9a60 100644
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -1,26 +1,9 @@
 {% load widget_tweaks %}
-{% 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 src="{% static "js/autocompleter.js" %}"></script>
-{% endblock %}
-
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
     Purchase Details
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     {% if create or edit or duplicate %}
     <div class="form-group" id="purchased-from-group">
       <label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
diff --git a/assets/views.py b/assets/views.py
index 29eaa7aa..b113a901 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -93,17 +93,17 @@ class AssetIDUrlMixin:
 
 class AssetDetail(LoginRequiredMixin, AssetIDUrlMixin, generic.DetailView):
     model = models.Asset
-    template_name = 'asset_update.html'
+    template_name = 'asset_detail.html'
 
 
 class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
-    template_name = 'asset_update.html'
+    template_name = 'asset_form.html'
     model = models.Asset
     form_class = forms.AssetForm
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['edit'] = True
+        context["edit"] = True
         context["connectors"] = models.Connector.objects.all()
 
         return context
@@ -113,7 +113,7 @@ class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
 
 
 class AssetCreate(LoginRequiredMixin, generic.CreateView):
-    template_name = 'asset_create.html'
+    template_name = 'asset_form.html'
     model = models.Asset
     form_class = forms.AssetForm
 
@@ -141,8 +141,6 @@ class DuplicateMixin:
 
 
 class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
-    model = models.Asset
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["create"] = None
diff --git a/templates/base_assets.html b/templates/base_assets.html
index fe27ddb3..cafc762b 100644
--- a/templates/base_assets.html
+++ b/templates/base_assets.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 
 {% block extrahead %}
-<meta name="google" content="notranslate">
+    <meta name="google" content="notranslate">
 {% endblock %}
 
 {% block titleheader %}