From 5162c1d11fdb7a95e58df42a76ad48b56595d2eb Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Fri, 27 Apr 2018 00:54:01 +1000
Subject: [PATCH] Inline deletion for BOM items

---
 InvenTree/part/templates/part/bom-delete.html |  22 ++--
 InvenTree/part/templates/part/bom.html        |  11 +-
 .../part/templates/part/category_detail.html  |   7 +-
 .../part/templates/part/category_parts.html   | 102 ++++--------------
 InvenTree/part/templates/part/index.html      |   2 +
 .../part/templates/part/partial_delete.html   |   2 +
 InvenTree/part/templates/part/tabs.html       |   2 +-
 InvenTree/part/views.py                       |   8 +-
 InvenTree/static/script/modal_form.js         |  16 ++-
 wip/ajax_request.js                           |  71 ++++++++++++
 10 files changed, 134 insertions(+), 109 deletions(-)
 create mode 100644 wip/ajax_request.js

diff --git a/InvenTree/part/templates/part/bom-delete.html b/InvenTree/part/templates/part/bom-delete.html
index 4cf9c8524e..d0f36d9b71 100644
--- a/InvenTree/part/templates/part/bom-delete.html
+++ b/InvenTree/part/templates/part/bom-delete.html
@@ -1,15 +1,9 @@
-{% extends "delete_obj.html" %}
+Are you sure you want to delete this BOM item?
+<br>
+Deleting this entry will remove the BOM row from the following part:
 
-{% block del_title %}
-    Are you sure you want to delete this BOM item?
-{% endblock %}
-
-{% block del_body %}
-    Deleting this entry will remove the BOM row from the following part:
-
-    <ul class='list-group'>
-        <li class='list-group-item'>
-            <b>{{ item.part.name }}</b> - <i>{{ item.part.description }}</i>
-        </li>
-    </ul>
-{% endblock %}
\ No newline at end of file
+<ul class='list-group'>
+    <li class='list-group-item'>
+        <b>{{ item.part.name }}</b> - <i>{{ item.part.description }}</i>
+    </li>
+</ul>
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index 559b9a5af4..bb1b5c7eed 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -12,6 +12,7 @@
 {% include 'part/tabs.html' with tab='bom' %}
 
 {% include 'modal.html' %}
+{% include 'modal_delete.html' %}
 
 <h3>Bill of Materials</h3>
 
@@ -21,7 +22,7 @@
         <th>Part</th>
         <th>Description</th>
         <th data-type='number'>Quantity</th>
-        <th data-sortable='false'>Edit</th>
+        <th data-sortable='false'></th>
     </tr>
 </thead>
 <tbody>
@@ -33,6 +34,7 @@
     <td>{{ bom_item.quantity }}</td>
     <td>
         <button type='button' url="{% url 'bom-item-edit' bom_item.id %}" class='btn btn-success edit-row-button'>Edit</button>
+        <button type='button' url="{% url 'bom-item-delete' bom_item.id %}" class='btn btn-danger delete-row-button'>Delete</button>
     </td>
 </tr>
 {% endwith %}
@@ -55,6 +57,13 @@
 $(document).ready(function(){
     $('#bom-table').footable();
 
+    $('#bom-table').on('click', '.delete-row-button', function () {
+        var button = $(this);
+
+        launchDeleteForm("#modal-delete",
+                         button.attr('url'));
+    });
+
     $('#bom-table').on('click', '.edit-row-button', function () {
         var button = $(this);
 
diff --git a/InvenTree/part/templates/part/category_detail.html b/InvenTree/part/templates/part/category_detail.html
index 1c6212f6f4..88325bc82f 100644
--- a/InvenTree/part/templates/part/category_detail.html
+++ b/InvenTree/part/templates/part/category_detail.html
@@ -42,10 +42,12 @@
 {% endblock %}
 
 {% block javascript %}
-
+<script type='text/javascript' src="{% static 'script/footable.js' %}"></script>``
 <script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 
 <script type='text/javascript'>
+$(document).ready(function (){
+    $('#part-list').footable();
 
     $("#create-cat").click(function() {
         launchModalForm("#modal-form",
@@ -60,8 +62,7 @@
                         {data: {category: {{ category.id }}
                     }});
     });
-
-
+});
 </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/category_parts.html b/InvenTree/part/templates/part/category_parts.html
index a878d8ed4f..97dc1da910 100644
--- a/InvenTree/part/templates/part/category_parts.html
+++ b/InvenTree/part/templates/part/category_parts.html
@@ -1,90 +1,24 @@
-<div class='container'>
-    <div class='input-group'>
-        <input class='form-control' id='part-filter' type='text' placeholder='Search...'>
-        <span class='input-group-btn'>
-            <button type='button' class='btn' id='clear-filter'>Clear</button>
-        </span>
-    </div>
-
-<table class="table table-striped" id="part-list">
+<table class="table table-striped" data-sorting='true' id="part-list">
+<thead>
     <tr>
         <th>Part</th>
         <th>Description</th>
         <th>Category</th>
+        <th data-type='number'>Stock</th>
     </tr>
+</thead>
+<tbody>
+{% for part in parts %}
+<tr>
+    <td><a href="{% url 'part-detail' part.id %}">{{ part.name }}</a></td>
+    <td>{{ part.description }}</td>
+    <td>
+        {% if part.category %}
+        <a href="{% url 'category-detail' part.category.id %}">{{ part.category_path }}</a>
+        {% endif %}
+    </td>
+    <td>{{ part.total_stock }}</td>
+</tr>
+{% endfor %}
+</tbody>
 </table>
-
-</div>
-
-{% load static %}
-
-<script type="text/javascript" src="{% static 'script/delay.js' %}">
-</script>
-
-<script type="text/javascript">
-
-function add_part(part) {
-    var text = "<tr>";
-
-    text += "<td><a href='" + part.url + "'>" + part.name + "</a></td>";
-    text += "<td>" + part.description + "</td>";
-
-    text += "<td>";
-
-    // TODO - Work out how to add in category name + link...
-    if (part.category){
-        text += '<a href="/part/category/' + part.category + '/">';
-        text += part.category_path;
-        text += '</a>';
-    }
-
-    text += "</td>";
-
-    text += "</tr>";
-
-    $("#part-list").append(text);
-}
-
-function filter_parts(text) {
-    $.ajax({
-        url: "{% url 'api-part-list' %}",
-        data: {
-            {% if category %}
-            'category': {{ category.id }},
-            {% endif %}
-            'search': text
-        },
-        success: function(result) {
-            $("#part-list").find("tr:gt(0)").remove();
-            $.each(result.results, function(i, part) {
-                add_part(part);
-            })
-        }
-    });
-}
-
-$(document).ready(function() {
-    $("#part-filter").keyup(function(e) {
-        if (e.keyCode == 27){ // Escape key
-            cancelTimer();
-            $("#part-filter").val('');
-        }
-        else {
-            var value = $(this).val().toLowerCase();
-
-            delay(function() {
-                filter_parts(value);
-            }, 500);
-        }
-    });
-
-    $("#clear-filter").click(function(){
-        clearTimeout(keyDelay);
-        $("#company-filter").val('');
-        filter_parts('');
-    });
-
-    filter_parts('');
-});
-
-</script>
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/index.html b/InvenTree/part/templates/part/index.html
index 202c553956..fb6ac2da57 100644
--- a/InvenTree/part/templates/part/index.html
+++ b/InvenTree/part/templates/part/index.html
@@ -25,10 +25,12 @@
 
 {% block javascript %}
 
+<script type='text/javascript' src="{% static 'script/footable.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/modal_form.js' %}"></script>
 
 <script type="text/javascript">
 $(document).ready(function () {
+    $('#part-list').footable();
 
     $("#create-cat").click(function() {
         launchModalForm("#modal-form", "{% url 'category-create' %}");
diff --git a/InvenTree/part/templates/part/partial_delete.html b/InvenTree/part/templates/part/partial_delete.html
index 150b986e43..8d60cfff70 100644
--- a/InvenTree/part/templates/part/partial_delete.html
+++ b/InvenTree/part/templates/part/partial_delete.html
@@ -1,3 +1,5 @@
+Are you sure you want to delete part '{{ part.name }}'?
+
 {% if part.used_in_count %}
 <p>This part is used in BOMs for {{ part.used_in_count }} other parts. If you delete this part, the BOMs for the following parts will be updated:
 <ul class="list-group">
diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html
index 6c3aff79dd..2d27d476a7 100644
--- a/InvenTree/part/templates/part/tabs.html
+++ b/InvenTree/part/templates/part/tabs.html
@@ -20,7 +20,7 @@
     {% if part.purchaseable %}
     <li{% ifequal tab 'suppliers' %} class="active"{% endifequal %}>
         <a href="{% url 'part-suppliers' part.id %}">Suppliers
-            <span class="badge">{{ part.supplier_count }}<span>
+            <span class="badge">{{ part.supplier_count }}</span>
         </a></li>
     {% endif %}
     {% if part.trackable %}
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index debecdf10c..7bddfa7c7a 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -205,19 +205,21 @@ class BomItemEdit(AjaxUpdateView):
     ajax_form_title = 'Edit BOM item'
 
 
-class BomItemDelete(DeleteView):
+class BomItemDelete(AjaxDeleteView):
     model = BomItem
     template_name = 'part/bom-delete.html'
     context_object_name = 'item'
+    ajax_form_title = 'Confim BOM item deletion'
 
-    success_url = '/part'
+    #success_url = '/part'
 
+    """
     def post(self, request, *args, **kwargs):
         if 'confirm' in request.POST:
             return super(BomItemDelete, self).post(request, *args, **kwargs)
         else:
             return HttpResponseRedirect(self.get_object().get_absolute_url())
-
+    """
 
 class SupplierPartDetail(DetailView):
     model = SupplierPart
diff --git a/InvenTree/static/script/modal_form.js b/InvenTree/static/script/modal_form.js
index 447ca589ea..d1bfb69805 100644
--- a/InvenTree/static/script/modal_form.js
+++ b/InvenTree/static/script/modal_form.js
@@ -8,7 +8,8 @@ function attachSelect(modal) {
     });
 }
 
-function launchDeleteForm(modal, url, options) {
+function launchDeleteForm(modal, url, options = {}) {
+
     $(modal).on('shown.bs.modal', function() {
         $(modal + ' .modal-form-content').scrollTop(0);
     });
@@ -62,7 +63,7 @@ function launchDeleteForm(modal, url, options) {
     });
 }
 
-function launchModalForm(modal, url, options) {
+function launchModalForm(modal, url, options = {}) {
 
     $(modal).on('shown.bs.modal', function () {
         $(modal + ' .modal-form-content').scrollTop(0);
@@ -119,8 +120,17 @@ function launchModalForm(modal, url, options) {
             dataType: 'json',
             success: function (response) {
                 if (response.form_valid) {
-                    alert("Success!");
+
                     $(modal).modal('hide');
+
+                    if (options.redirect) {
+                        window.location.href = options.redirect;
+                    }
+
+                    if (options.success) {
+                        options.success();
+                    }
+
                 }
                 else if (response.html_form) {
                     var target = modal + ' .modal-form-content';
diff --git a/wip/ajax_request.js b/wip/ajax_request.js
new file mode 100644
index 0000000000..856af8ca47
--- /dev/null
+++ b/wip/ajax_request.js
@@ -0,0 +1,71 @@
+{% load static %}
+
+<script type="text/javascript" src="{% static 'script/delay.js' %}">
+</script>
+
+<script type="text/javascript">
+
+function add_part(part) {
+    var text = "<tr>";
+
+    text += "<td><a href='" + part.url + "'>" + part.name + "</a></td>";
+    text += "<td>" + part.description + "</td>";
+
+    text += "<td>";
+
+    // TODO - Work out how to add in category name + link...
+    if (part.category){
+        text += '<a href="/part/category/' + part.category + '/">';
+        text += part.category_path;
+        text += '</a>';
+    }
+
+    text += "</td>";
+
+    text += "</tr>";
+
+    $("#part-list").append(text);
+}
+
+function filter_parts(text) {
+    $.ajax({
+        url: "{% url 'api-part-list' %}",
+        data: {
+            {% if category %}
+            'category': {{ category.id }},
+            {% endif %}
+            'search': text
+        },
+        success: function(result) {
+            $("#part-list").find("tr:gt(0)").remove();
+            $.each(result.results, function(i, part) {
+                add_part(part);
+            })
+        }
+    });
+}
+
+
+$("#part-filter").keyup(function(e) {
+    if (e.keyCode == 27){ // Escape key
+        cancelTimer();
+        $("#part-filter").val('');
+    }
+    else {
+        var value = $(this).val().toLowerCase();
+
+        delay(function() {
+            filter_parts(value);
+        }, 500);
+    }
+});
+
+$("#clear-filter").click(function(){
+    clearTimeout(keyDelay);
+    $("#company-filter").val('');
+    filter_parts('');
+});
+
+filter_parts('');
+
+</script>
\ No newline at end of file