From b02589481de7f88a6dad83d77d74116046cba3d7 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 4 Mar 2022 10:47:19 +0000
Subject: [PATCH] Bug 30108: (follow-up) Add required indication, differentiate
 alert

As asked on comment4:
[1] Add a required div as a visible hint when applicable.
[2] Differentiate alert for hold start and end date.

Test plan:
See former patch.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../bootstrap/en/modules/opac-reserve.tt        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 7c8b8c77dd..99e282cffb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -498,7 +498,8 @@
 [% INCLUDE 'datatables.inc' %]
 <script>
     var MSG_NO_ITEM_SELECTED = _("Expecting a specific item selection.");
-    var MSG_EMPTY_DATE = _("Date should be filled.");
+    var MSG_EMPTY_START_DATE = _("Hold start date should be filled.");
+    var MSG_EMPTY_END_DATE   = _("Hold expiration date should be filled.");
 
     $(document).ready(function() {
 
@@ -516,8 +517,14 @@
         $(".hold-options").hide();
         var OPACMandatoryHoldDates = "[% Koha.Preference('OPACMandatoryHoldDates') | html %]";
         if( OPACMandatoryHoldDates ) {
-            if( OPACMandatoryHoldDates == "start" || OPACMandatoryHoldDates == "both" ) $(".holddatefrom").prop( 'required', true );
-            if( OPACMandatoryHoldDates == "end"   || OPACMandatoryHoldDates == "both" ) $(".futuredate").prop( 'required', true );
+            if( OPACMandatoryHoldDates == "start" || OPACMandatoryHoldDates == "both" ) {
+                $(".holddatefrom").prop( 'required', true );
+                $(".holddatefrom").parent().append('<div class="required_label required">Required</div>');
+            }
+            if( OPACMandatoryHoldDates == "end"   || OPACMandatoryHoldDates == "both" ) {
+                $(".futuredate").prop( 'required', true );
+                $(".futuredate").parent().append('<div class="required_label required">Required</div>');
+            }
         }
         $(".holddatefrom,.futuredate").prop("readOnly", true);
 
@@ -661,13 +668,13 @@
                 }
 
                 if( $(".holddatefrom").prop('required') && $("#from"+ biblioNum).val() == '' ) {
-                    alert(MSG_EMPTY_DATE);
+                    alert(MSG_EMPTY_START_DATE);
                     badBib = biblioNum;
                     if( $("#from"+biblioNum+":hidden").length ) $("#toggle-hold-options-"+biblioNum).click();
                     $("#from"+ biblioNum).focus();
                     return false;
                 } else if( $(".futuredate").prop('required') && $("#to"+ biblioNum).val() == '' ) {
-                    alert(MSG_EMPTY_DATE);
+                    alert(MSG_EMPTY_END_DATE);
                     badBib = biblioNum;
                     if( $("#to"+biblioNum+":hidden").length ) $("#toggle-hold-options-"+biblioNum).click();
                     $("#to"+ biblioNum).focus();
-- 
2.20.1