From c511019b2131dcb5b1b834b888a2dbd1bcc4a599 Mon Sep 17 00:00:00 2001
From: afkiwers <andre@currawong.aero>
Date: Fri, 8 Dec 2023 12:44:07 +1100
Subject: [PATCH 1/4] Removed matching

We already know what parameters go where from the settings
---
 inventree_kicad/KiCadLibraryPlugin.py | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/inventree_kicad/KiCadLibraryPlugin.py b/inventree_kicad/KiCadLibraryPlugin.py
index 7374e45..46a62d5 100644
--- a/inventree_kicad/KiCadLibraryPlugin.py
+++ b/inventree_kicad/KiCadLibraryPlugin.py
@@ -162,6 +162,14 @@ def import_meta_data(self, request):  # noqa
         if request.FILES.get('file', False):
             file = request.FILES.get('file', False)
 
+            kicad_footprint_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None)
+            kicad_reference_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None)
+            kicad_symbol_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None)
+
+            if kicad_footprint_param_id is None or kicad_reference_param_id is None  or kicad_symbol_param_id is None:
+                return JsonResponse({'error': 'Missing parameters. Please make sure you have selected appropriate parameters in the settings before attempting to import anything.'}, status=422)
+
+
             # Make sure we have got a xml file
             if 'xml' not in file.content_type:
                 return JsonResponse({'error': 'XML file expected!'}, status=422)
@@ -174,20 +182,6 @@ def import_meta_data(self, request):  # noqa
             components = root.find('components')
             inventree_parts = set()
 
-            # create dict from selection
-            field_name_matching = json.loads(request.POST['fieldNameMatching'])
-
-            # user needs to match all KiCad Parameter
-            if 'false' in field_name_matching.values():
-                return JsonResponse(
-                    {'error': 'Some KiCad Parameters were not matched with an InvenTree parameter.'},
-                    status=406
-                )
-
-            kicad_footprint_param_id = field_name_matching['Footprint']
-            kicad_reference_param_id = field_name_matching['Reference']
-            kicad_symbol_param_id = field_name_matching['Symbol']
-
             # Iterate through all child components with the tag 'comp'
             for idx, comp in enumerate(components.findall('comp')):
 

From 743b7b2bb4f216c7da94a90848481a01556c8c18 Mon Sep 17 00:00:00 2001
From: afkiwers <andre@currawong.aero>
Date: Fri, 8 Dec 2023 13:00:07 +1100
Subject: [PATCH 2/4] removed obsolete code

---
 .../inventree_kicad/kicad_bom_import.html     | 43 ++-----------------
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html b/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html
index 4d04d81..69b1475 100644
--- a/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html
+++ b/inventree_kicad/templates/inventree_kicad/kicad_bom_import.html
@@ -5,18 +5,7 @@
 <script>
     async function upload_csv() {
         var formData = new FormData();
-        var fieldNameMatching = {};
 
-        $('#tblFieldMatching tr[id^="kicad_"]').each(function () {
-
-            let selectedIndex = this.cells[1].children[0].selectedIndex;
-            let selectedVal = this.cells[1].children[0].options[selectedIndex].value
-
-            fieldNameMatching[this.cells[0].getAttribute("value")] = selectedVal
-
-        });
-
-        formData.append("fieldNameMatching", JSON.stringify(fieldNameMatching))  // Matches those that begin with 'tcol'
         formData.append("file", fileupload.files[0]);
 
         const cmd_url = "{% url 'plugin:kicad-library-plugin:meta_data_upload' %}"
@@ -31,7 +20,7 @@
 
     }
 
-    async function extract_header() {
+    async function submit_button_controller() {
         $('#upload-form').on('change', function (evt) {
 
             if (evt.target.files == null) {
@@ -86,35 +75,11 @@ <h4>KiCad Metadata Import</h4>
     <div class="mb-3">
         <label for="formFile" class="form-label">Please select an XML file</label>
         <input class="form-control" accept=".xml" type="file" id="fileupload" name="fileupload"
-               onchange="extract_header()">
+               onchange="submit_button_controller()">
     </div>
 
-    <table class="table table-condensed" id="tblFieldMatching">
-        <tbody>
-        <tr>
-            <th>KiCad Parameter</th>
-            <th>Available InvenTree Parameter</th>
-        </tr>
-
-        {% for ki_para in kicad_parameters %}
-            <tr id="kicad_{{ forloop.counter0 }}">
-                <td value="{{ ki_para }}"><em>{{ ki_para }}</em></td>
-                <td>
-                    <select class="select form-control" name="parameters">
-                        <option value=false>-----</option>
-                        {% for template in part_parameter_templates %}
-                            <option value="{{ template.id }}">{{ template.name }}</option>
-                        {% endfor %}
-                    </select>
-                </td>
-            </tr>
-        {% endfor %}
-
-        </tbody>
-    </table>
-
 </form>
 
-<button type="submit" class="btn btn-primary" onclick="upload_csv()" title='Import' id="btn_import" disabled>Import
-    Data
+<button type="submit" class="btn btn-primary" onclick="upload_csv()" title='Import' id="btn_import" disabled>
+    Import Metadata
 </button>
\ No newline at end of file

From 326bfe59efe8eaf201d3172d9b11651b18474e3f Mon Sep 17 00:00:00 2001
From: afkiwers <andre@currawong.aero>
Date: Fri, 8 Dec 2023 13:01:33 +1100
Subject: [PATCH 3/4] upped version number

---
 inventree_kicad/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inventree_kicad/version.py b/inventree_kicad/version.py
index 260bc9a..ea979b0 100644
--- a/inventree_kicad/version.py
+++ b/inventree_kicad/version.py
@@ -1 +1 @@
-KICAD_PLUGIN_VERSION = "1.3.7"
+KICAD_PLUGIN_VERSION = "1.3.8"

From c34b1e553acfcac4a2caaaa255bd93843385fe48 Mon Sep 17 00:00:00 2001
From: afkiwers <andre@currawong.aero>
Date: Fri, 8 Dec 2023 13:03:33 +1100
Subject: [PATCH 4/4] fixed style issues

---
 inventree_kicad/KiCadLibraryPlugin.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/inventree_kicad/KiCadLibraryPlugin.py b/inventree_kicad/KiCadLibraryPlugin.py
index 46a62d5..8d7b116 100644
--- a/inventree_kicad/KiCadLibraryPlugin.py
+++ b/inventree_kicad/KiCadLibraryPlugin.py
@@ -7,7 +7,6 @@
 
 """
 import datetime
-import json
 
 from django.core.validators import URLValidator
 
@@ -166,9 +165,12 @@ def import_meta_data(self, request):  # noqa
             kicad_reference_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None)
             kicad_symbol_param_id = self.plugin.get_setting('KICAD_SYMBOL_PARAMETER', None)
 
-            if kicad_footprint_param_id is None or kicad_reference_param_id is None  or kicad_symbol_param_id is None:
-                return JsonResponse({'error': 'Missing parameters. Please make sure you have selected appropriate parameters in the settings before attempting to import anything.'}, status=422)
-
+            if kicad_footprint_param_id is None or kicad_reference_param_id is None or kicad_symbol_param_id is None:
+                return JsonResponse(
+                    {
+                        'error': 'Missing parameters. Please make sure you have selected appropriate parameters in the settings before attempting to import anything.'
+                    },
+                    status=422)
 
             # Make sure we have got a xml file
             if 'xml' not in file.content_type: