From 434c273fafbd2bf069053fb2f70395281f47f924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johnny=20Marie=CC=81thoz?= <Johnny.Mariethoz@rero.ch>
Date: Tue, 16 Mar 2021 11:16:18 +0100
Subject: [PATCH] editor: prevent the enter key to submit the form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prevents the enter key to submit the form in some fields that may be
  filled though a scanning device.
* Closes #1421.

Co-Authored-by: Johnny Mariéthoz <johnny.mariethoz@rero.ch>
---
 .../document_identified_by-v0.0.1.json        |  3 +-
 .../ill_requests/ill_request-v0.0.1.json      |  7 +++-
 .../templates/rero_ils/ill_request_form.html  | 24 +++++++++++--
 .../items/jsonschemas/items/item-v0.0.1.json  |  3 +-
 .../jsonschemas/patrons/patron-v0.0.1.json    |  6 ++++
 .../theme/assets/js/reroils/ills_request.js   | 36 +++++++++++++++++++
 rero_ils/theme/assets/js/reroils/public.js    |  2 +-
 7 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 rero_ils/theme/assets/js/reroils/ills_request.js

diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json
index ee5e1ae91b..e49495a055 100644
--- a/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json
+++ b/rero_ils/modules/documents/jsonschemas/documents/document_identified_by-v0.0.1.json
@@ -153,7 +153,8 @@
           "minLength": 1,
           "form": {
             "templateOptions": {
-              "itemCssClass": "col-lg-6"
+              "itemCssClass": "col-lg-6",
+              "doNotSubmitOnEnter": true
             }
           }
         },
diff --git a/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json b/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json
index 4d9cbe82a9..90f495a0ee 100644
--- a/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json
+++ b/rero_ils/modules/ill_requests/jsonschemas/ill_requests/ill_request-v0.0.1.json
@@ -200,7 +200,12 @@
         },
         "identifier": {
           "type": "string",
-          "title": "Identifier"
+          "title": "Identifier",
+          "form": {
+            "templateOptions": {
+              "doNotSubmitOnEnter": true
+            }
+          }
         },
         "source": {
           "type": "object",
diff --git a/rero_ils/modules/ill_requests/templates/rero_ils/ill_request_form.html b/rero_ils/modules/ill_requests/templates/rero_ils/ill_request_form.html
index e029e6a2f1..fcf3f59b10 100644
--- a/rero_ils/modules/ill_requests/templates/rero_ils/ill_request_form.html
+++ b/rero_ils/modules/ill_requests/templates/rero_ils/ill_request_form.html
@@ -27,7 +27,7 @@ <h4 class="alert-heading">{{ _('Caution!') }}</h4>
     <p class="mb-0">{{ _('A well detailed request is more likely to be satisfied') }}</p>
   </div>
 
-  <form action="{{ url_for('ill_requests.ill_request_form') }}" method="POST" class="form" role="form" novalidate>
+  <form id="ill-public-form" action="{{ url_for('ill_requests.ill_request_form') }}" method="POST" class="form" role="form" novalidate>
     {{ form.hidden_tag() }}
     {%- if form.csrf_token and form.csrf_token.errors %}
       <div class="alert alert-danger" role="alert">
@@ -62,8 +62,28 @@ <h3>{{ _('Request information') }}</h3>
     </section>
     <div class="row pt-3">
       <div class="col text-right">
-        <input type="submit" id="submit" class="btn btn-primary" value="{{ _('Create request') }}"/>
+        <input type="submit" id="submit" class="btn btn-primary" value="{{ _('Submit') }}"/>
       </div>
     </div>
   </form>
+
+  <div id="ill-modal-confirmation" class="modal fade" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title">{{ _('Confirmation') }}</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <p>{{ _('Costs may apply. By confirming, you agree to the interlibrary loan conditions of the pick-up library.') }}</p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline-danger" data-dismiss="modal">{{ _('Cancel') }}</button>
+          <button id="ill-modal-confirmation-btn" type="button" class="btn btn-primary">{{ _('Confirm') }}</button>
+        </div>
+      </div>
+    </div>
+  </div>
 {%- endblock body %}
diff --git a/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json b/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json
index 14f8b2c82b..da17e37299 100644
--- a/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json
+++ b/rero_ils/modules/items/jsonschemas/items/item-v0.0.1.json
@@ -51,7 +51,8 @@
       "form": {
         "focus": true,
         "templateOptions": {
-          "labelClasses": "col-2 text-right"
+          "labelClasses": "col-2 text-right",
+          "doNotSubmitOnEnter": true
         },
         "navigation": {
           "essential": true
diff --git a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json
index c98a99b145..394c04fda9 100644
--- a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json
+++ b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json
@@ -174,6 +174,9 @@
             "type": "string",
             "minLength": 6,
             "form": {
+              "templateOptions": {
+                "doNotSubmitOnEnter": true
+              },
               "validation": {
                 "validators": {
                   "valueAlreadyExists": {
@@ -377,6 +380,9 @@
       },
       "form": {
         "hideExpression": "!field.parent.model.roles.some(v => v === 'patron')",
+        "expressionProperties": {
+          "templateOptions.required": "true"
+        },
         "templateOptions": {
           "wrappers": [
             "card"
diff --git a/rero_ils/theme/assets/js/reroils/ills_request.js b/rero_ils/theme/assets/js/reroils/ills_request.js
new file mode 100644
index 0000000000..db08244ad4
--- /dev/null
+++ b/rero_ils/theme/assets/js/reroils/ills_request.js
@@ -0,0 +1,36 @@
+/*
+
+RERO ILS
+Copyright (C) 2019 RERO
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, version 3 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+import $ from 'jquery';
+
+// show a confirmation modal dialog on form submission
+$("#submit").on("click", function(event){
+  if($(this).data('confirmed') !== true) {
+    $("#ill-modal-confirmation").modal('show');
+    event.preventDefault();
+  }
+});
+
+// close the dialog, confirmed is true and trigger the submit click button
+$("#ill-modal-confirmation-btn").on("click", function(event){
+  $( "#submit" ).data('confirmed', true);
+  $("#ill-modal-confirmation").modal('hide');
+  // form submit does not works
+  $("#submit").trigger('click');
+});
diff --git a/rero_ils/theme/assets/js/reroils/public.js b/rero_ils/theme/assets/js/reroils/public.js
index a4ef9513e3..210daf0615 100644
--- a/rero_ils/theme/assets/js/reroils/public.js
+++ b/rero_ils/theme/assets/js/reroils/public.js
@@ -16,9 +16,9 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 */
-
 import 'bootstrap';
 import './tooltip';
 import './toast';
 import './login';
 import './toggle';
+import './ills_request';