From 20cd3f6efeb0ca10e2b03c2bd1634bd058599f73 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 25 Mar 2021 15:02:59 +0100
Subject: [PATCH] more inputs that can display errors

---
 htdocs/lib/settings/WsjtDecodingDepthsInput.js |  4 ++--
 owrx/form/wsjt.py                              | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/lib/settings/WsjtDecodingDepthsInput.js b/htdocs/lib/settings/WsjtDecodingDepthsInput.js
index f02b27f..f06f59c 100644
--- a/htdocs/lib/settings/WsjtDecodingDepthsInput.js
+++ b/htdocs/lib/settings/WsjtDecodingDepthsInput.js
@@ -45,7 +45,6 @@ $.fn.wsjtDecodingDepthsInput = function() {
         };
 
         $table.on('change', updateValue);
-        $el.append($table);
         var $addButton = $('<button type="button" class="btn btn-sm btn-primary">Add...</button>');
 
         $addButton.on('click', function() {
@@ -63,6 +62,7 @@ $.fn.wsjtDecodingDepthsInput = function() {
             updateValue();
             return false;
         });
-        $el.append($addButton);
+
+        $input.after($table, $addButton);
     });
 };
\ No newline at end of file
diff --git a/owrx/form/wsjt.py b/owrx/form/wsjt.py
index 6fa7302..3dcaf91 100644
--- a/owrx/form/wsjt.py
+++ b/owrx/form/wsjt.py
@@ -25,16 +25,20 @@ class Q65ModeMatrix(Input):
             disabled="" if interval.is_available(mode) and not self.disabled else "disabled",
         )
 
-    def render_input(self, value, errors):
-        checkboxes = "".join(
-            self.render_checkbox(mode, interval, value, errors) for interval in Q65Interval for mode in Q65Mode
-        )
+    def render_input_group(self, value, errors):
         return """
             <div class="matrix q65-matrix">
                 {checkboxes}
+                {errors}
             </div>
         """.format(
-            checkboxes=checkboxes
+            checkboxes=self.render_input(value, errors),
+            errors=self.render_errors(errors),
+        )
+
+    def render_input(self, value, errors):
+        return "".join(
+            self.render_checkbox(mode, interval, value, errors) for interval in Q65Interval for mode in Q65Mode
         )
 
     def input_classes(self, error):