From cfbfc6e258dcc8093e0a89e378d027e9268e9f14 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Fri, 28 Jun 2019 20:41:45 +1000
Subject: [PATCH] Delete columns in-place using javascript

---
 .../part/bom_upload/select_fields.html        | 19 +++++++++++--------
 InvenTree/part/views.py                       |  3 ---
 InvenTree/static/script/inventree/bom.js      | 19 +++++++++++++++++++
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/InvenTree/part/templates/part/bom_upload/select_fields.html b/InvenTree/part/templates/part/bom_upload/select_fields.html
index e74c49691a..1175ed353b 100644
--- a/InvenTree/part/templates/part/bom_upload/select_fields.html
+++ b/InvenTree/part/templates/part/bom_upload/select_fields.html
@@ -7,7 +7,8 @@
 
 {% if missing and missing|length > 0 %}
 <div class='alert alert-danger alert-block' role='alert'>
-    Missing selections for the following columns:
+    Missing selections for the following required columns:
+    <br>
     <ul>
         {% for col in missing %}
         <li>{{ col }}</li>
@@ -30,18 +31,20 @@
                 <th>Row</th>
                 {% for col in bom_cols %}
                 <th>
+                    <input type='hidden' name='col_name_{{ forloop.counter0 }}' value='{{ col.name }}'/>
+                    {{ col.name }}
+                    <button class='btn btn-default btn-remove' id='del_col_{{ forloop.counter0 }}' title='Remove column'>
+                        <span col='col_{{ forloop.counter0 }}' onClick='removeColFromBomWizard()' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                    </button>
                     <select class='select' id='id_col_{{ forloop.counter0 }}' name='col_select_{{ forloop.counter0 }}'>
-                        <option value=''>---------</option>
-                        {% for req in req_cols %}
-                        <option value='{{ req }}'{% if req == col.guess %}selected='selected'{% endif %}>{{ req }}</option>
-                        {% endfor %}
-                        <option value='Delete'>Delete Column</option>
+                            <option value=''>---------</option>
+                            {% for req in req_cols %}
+                            <option value='{{ req }}'{% if req == col.guess %}selected='selected'{% endif %}>{{ req }}</option>
+                            {% endfor %}
                     </select>
                     {% if col.duplicate %}
                     <p class='help-inline'>Duplicate column selection</p>
                     {% endif %}
-                    <input type='hidden' name='col_name_{{ forloop.counter0 }}' value='{{ col.name }}'/>
-                    {{ col.name }}
                 </th>
                 {% endfor %}
             </tr>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 94fc00b30a..1763ce918e 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -767,9 +767,6 @@ class BomUpload(AjaxView, FormMixin):
                 col_id = int(item.replace('col_select_', ''))
                 col_name = value
 
-                if value.lower() == 'delete':
-                    continue
-
                 column_selections[col_id] = value
 
             # Extract the row data
diff --git a/InvenTree/static/script/inventree/bom.js b/InvenTree/static/script/inventree/bom.js
index 47a3151f43..581fb8d4a3 100644
--- a/InvenTree/static/script/inventree/bom.js
+++ b/InvenTree/static/script/inventree/bom.js
@@ -12,6 +12,25 @@ function reloadBomTable(table, options) {
 }
 
 
+function removeColFromBomWizard(e) {
+    /* Remove a column from BOM upload wizard
+     */
+
+    e = e || window.event;
+
+    var src = e.target || e.srcElement;
+
+    // Which column was clicked?
+    var col = $(src).closest('th').index();
+
+    var table = $(src).closest('table');
+
+    table.find('tr').each(function() {
+        this.removeChild(this.cells[col]);
+    });
+}
+
+
 function loadBomTable(table, options) {
     /* Load a BOM table with some configurable options.
      *