From ba2b58c2a78072eabd2d00a9d87856ef6e669a7e Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 15 Apr 2022 17:46:58 +0200
Subject: [PATCH 1/3] Catch all errors

---
 src/bika/lims/browser/analysisrequest/add2.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bika/lims/browser/analysisrequest/add2.py b/src/bika/lims/browser/analysisrequest/add2.py
index 0bb0030fde..27b67e86e2 100644
--- a/src/bika/lims/browser/analysisrequest/add2.py
+++ b/src/bika/lims/browser/analysisrequest/add2.py
@@ -1647,9 +1647,9 @@ def ajax_submit(self):
                     self.request,
                     record,
                 )
-            except (KeyError, RuntimeError) as e:
+            except Exception as e:
                 actions.resume()
-                errors["message"] = e.message
+                errors["message"] = str(e)
                 return {"errors": errors}
             # We keep the title to check if AR is newly created
             # and UID to print stickers

From 1758478ac187add5a33ac2f05a68906b64eafcb7 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 15 Apr 2022 17:47:20 +0200
Subject: [PATCH 2/3] Add the famous monkey;)

---
 .../core/browser/static/js/bika.lims.analysisrequest.add.js     | 2 +-
 .../static/js/coffee/bika.lims.analysisrequest.add.coffee       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/senaite/core/browser/static/js/bika.lims.analysisrequest.add.js b/src/senaite/core/browser/static/js/bika.lims.analysisrequest.add.js
index 4b8158daf7..15b92a5aeb 100644
--- a/src/senaite/core/browser/static/js/bika.lims.analysisrequest.add.js
+++ b/src/senaite/core/browser/static/js/bika.lims.analysisrequest.add.js
@@ -1377,7 +1377,7 @@
         if (data['errors']) {
           msg = data.errors.message;
           if (msg !== "") {
-            msg = msg + "<br/>";
+            msg = _t("Sorry, an error occured 🙈<p class='code'>" + msg + "</p>");
           }
           for (fieldname in data.errors.fielderrors) {
             field = $("#" + fieldname);
diff --git a/src/senaite/core/browser/static/js/coffee/bika.lims.analysisrequest.add.coffee b/src/senaite/core/browser/static/js/coffee/bika.lims.analysisrequest.add.coffee
index ad1236acac..22970e85e2 100644
--- a/src/senaite/core/browser/static/js/coffee/bika.lims.analysisrequest.add.coffee
+++ b/src/senaite/core/browser/static/js/coffee/bika.lims.analysisrequest.add.coffee
@@ -1379,7 +1379,7 @@ class window.AnalysisRequestAdd
       if data['errors']
         msg = data.errors.message
         if msg isnt ""
-          msg = "#{msg}<br/>"
+          msg = _t("Sorry, an error occured 🙈<p class='code'>#{msg}</p>")
 
         for fieldname of data.errors.fielderrors
           field = $("##{fieldname}")

From 8baddb6ad48b521b57581930e1bd16051146fe4c Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 15 Apr 2022 17:53:32 +0200
Subject: [PATCH 3/3] Changelog updated

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index bc67c89571..d72c591c47 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,7 @@ Changelog
 2.2.0 (unreleased)
 ------------------
 
+- #1970 Better error messages in sample add form
 - #1960 AddressField and AddressWidget with React component for DX types
 - #1968 Fix default roles for client field in samples
 - #1962 Allow to create worksheet from samples