From e22e0e09dd9a1e3aad3fb2a8e3d93459cacac597 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sat, 18 Mar 2023 10:13:09 +0000
Subject: [PATCH] Bug 32610: Add date extended patron attributes to patron
 module

This makes the necessary changes in the patron module of
the staff interface, so the new patron attribute appers and
behaves correctly when editing a patron record.

To test:
* You will need to test different configuration options for
  extended patron attributes (PA) in combination with the date option:
  * PA is a date and not mandatory
    * Patron form should have the calendar widget to let you set the date.
  * PA is a date and mandatory
    * Patron form shoudl have calendar widget and check that the date is
      set for allowing you to save the record.
  * PA is a date and unique
    * For this set the date in one patron record and try to
      set the same date in another. You should not be able to save.
  * PA displays in brief patron information
    * Make sure the date displays on the left formatted correctly
  * When the date PAs are saved, they should display nicely formatted
    on the details tab.

Signed-off-by: Philip Orr <philip.orr@lmscloud.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../intranet-tmpl/prog/en/includes/circ-menu.inc |  7 ++++++-
 .../prog/en/modules/members/memberentrygen.tt    | 16 +++++++++++++---
 .../prog/en/modules/members/moremember.tt        |  6 +++++-
 members/memberentry.pl                           |  1 +
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 6facc63971..b54aa71d6e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -115,7 +115,12 @@
             [% IF ( extendedattribute.type.display_checkout ) %] [%# FIXME We should filter in the line above %]
                 [% IF ( extendedattribute.attribute.defined  ) %]
                     <li class="patronattribute">
-                        <span class="patronattributelabel">[% extendedattribute.type.description | html %]</span>: [% extendedattribute.description | html %]
+                        <span class="patronattributelabel">[% extendedattribute.type.description | html %]</span>:
+                        [% IF extendedattribute.type.is_date %]
+                            [% extendedattribute.description | $KohaDates %]
+                        [% ELSE %]
+                            [% extendedattribute.description | html %]
+                        [% END %]
                     </li>
                 [% END %]
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 274b9c21f7..bd2bd23ae7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1657,13 +1657,23 @@ legend.collapsed i.fa.fa-caret-down::before {
                                                                 </select>
                                                             [% ELSE %]
                                                                 [% IF patron_attribute.mandatory %]
-                                                                <textarea rows="2" cols="30" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]" required="required">[% patron_attribute.value | html %]</textarea>
+                                                                    [% IF patron_attribute.is_date %]
+                                                                        <input type="text" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]"  maxlength="10" size="10" value="[% patron_attribute.value | html %]" required="required" class="flatpickr" data-date_to="to" />
+                                                                    [% ELSE %]
+                                                                        <textarea rows="2" cols="30" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]" required="required">[% patron_attribute.value | html %]</textarea>
+                                                                    [% END %]
                                                                 [% ELSE %]
-                                                                <textarea rows="2" cols="30" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">[% patron_attribute.value | html %]</textarea>
+                                                                    [% IF patron_attribute.is_date %]
+                                                                        <input type="text" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]"  maxlength="10" size="10" value="[% patron_attribute.value | html %]" class="flatpickr" data-date_to="to" />
+                                                                    [% ELSE %]
+                                                                        <textarea rows="2" cols="30" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">[% patron_attribute.value | html %]</textarea>
+                                                                    [% END %]
                                                                 [% END %]
                                                             [% END # /IF ( patron_attribute.use_dropdown ) %]
                                                             <input type="hidden" id="[% patron_attribute.form_id | html %]_code" name="[% patron_attribute.form_id | html %]_code" value="[% patron_attribute.code | html %]" />
-                                                            <a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash-can"></i> Clear</a>
+                                                            [% IF ( !patron_attribute.is_date ) %]
+                                                                <a href="#" class="clear_attribute"><i class="fa fa-fw fa-trash-can"></i> Clear</a>
+                                                            [% END %]
                                                             [% IF ( patron_attribute.repeatable ) %]
                                                                 <a href="#" class="clone_attribute"><i class="fa fa-fw fa-plus"></i> New</a>
                                                             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 6d8ee98f69..cd209c43cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -335,7 +335,11 @@
                                                         [% FOREACH item IN attribute.items %]
                                                             <li data-pa_code="[% item.type.code | replace('[^a-zA-Z0-9_-]', '') %]">
                                                                 <span class="label">[% item.type.description | html %]: </span>
-                                                                [% item.description | html_line_break %]
+                                                                [% IF item.type.is_date %]
+                                                                    [% item.description | $KohaDates %]
+                                                                [% ELSE %]
+                                                                    [% item.description | html_line_break %]
+                                                                [% END %]
                                                             </li>
                                                         [% END %]
                                                     </ol>
diff --git a/members/memberentry.pl b/members/memberentry.pl
index e28e8c1449..fe0d1beff0 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -880,6 +880,7 @@ sub patron_attributes_form {
             category          => $attr_type->authorised_value_category(),
             category_code     => $attr_type->category_code(),
             mandatory         => $attr_type->mandatory(),
+            is_date           => $attr_type->is_date(),
         };
         if (exists $attr_hash{$attr_type->code()}) {
             foreach my $attr (@{ $attr_hash{$attr_type->code()} }) {
-- 
2.39.5