Attachment 140621 Details for Bug 31562 – Bug 31562: Treat flags as other borrower fields

[patch] Bug 31562: Treat flags as other borrower fields

Bug-31562-Treat-flags-as-other-borrower-fields.patch (text/plain), 9.14 KB, created by Nick Clemens (kidclamp) on 2022-09-14 11:30:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2022-09-14 11:30:25 UTC

Size: 9.14 KB

patch

obsolete

>From c7763941cb7f10e03149c806f876c8ad1459a21b Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Wed, 14 Sep 2022 11:27:03 +0000
>Subject: [PATCH] Bug 31562: Treat flags as other borrower fields
>
>Rather than generate a custom hash for these fields, we should treat them as other borrower data fields
>
>To test:
> 1 - Edit a patron, note the 'Lost card' and 'Gone no address' fields
> 2 - Edit syspref BorrowerunwantedField
> 3 - Set gonenoaddress and lost as unwanted
> 4 - Edit patron, the fields remain
> 5 - Apply patch
> 6 - Edit a patron, fields are hidden
> 7 - Unhide one of the fields
> 8 - Edit a patron and confirm it shows and saves correctly
> 9 - Unhide the other field
>10 - Confirm it can be edited and saved
>---
> .../prog/en/modules/members/memberentrygen.tt | 56 ++++++++++++++-----
> members/memberentry.pl                        | 23 --------
> 2 files changed, 41 insertions(+), 38 deletions(-)
>
>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 2988157361..b905c2462b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -1309,38 +1309,64 @@ legend:hover {
>                                 [% END # UNLESS nouserid && nopassword && !CanUpdatePasswordExpiration %]
> 
>                                 
>-                                [% UNLESS ( opadd || opduplicate ) %]
>+                                [% UNLESS ( opadd || opduplicate || ( nogonenoaddress && nolost ) ) %]
>                                     <fieldset class="rows" id="memberentry_account_flags">
>                                         <legend id="account_flags_lgd">Patron account flags</legend>
>                                         <ol class="radio">
>-                                            [% FOREACH flagloo IN flagloop %]
>+                                            [% UNLESS nogonenoaddress %]
>                                                 <li>
>-                                                    <label class="radio" for="yes[% flagloo.name | html %]">
>-                                                        [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no address:[% END %]
>-                                                        [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
>+                                                    <label class="radio" for="yesgonenoaddress">
>+                                                        Gone no address:
>                                                     </label>
>                                                     [% IF CAN_user_circulate_manage_restrictions %]
>-                                                        <label for="yes[% flagloo.name | html %]">
>-                                                            [% IF ( flagloo.yes ) %]
>-                                                                <input type="radio" id="yes[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="1" checked="checked" />
>+                                                        <label for="yesgonenoaddress">
>+                                                            [% IF ( borrower_data.gonenoaddress ) %]
>+                                                                <input type="radio" id="yesgonenoaddress" name="gonenoaddress" value="1" checked="checked" />
>                                                             [% ELSE %]
>-                                                                <input type="radio" id="yes[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="1" />
>+                                                                <input type="radio" id="yesgonenoaddress" name="gonenoaddress" value="1" />
>                                                             [% END %]
>                                                                 Yes
>                                                         </label>
>-                                                        <label for="no[% flagloo.name | html %]">
>-                                                            [% IF ( flagloo.no ) %]
>-                                                                <input type="radio" id="no[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="0" checked="checked"/>
>+                                                        <label for="nogonenoaddress">
>+                                                            [% IF ( borrower_data.gonenoaddress ) %]
>+                                                                <input type="radio" id="nogonenoaddress" name="gonenoaddress" value="0" />
>                                                             [% ELSE %]
>-                                                                <input type="radio" id="no[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="0" />
>+                                                                <input type="radio" id="nogonenoaddress" name="gonenoaddress" value="0" checked="checked"/>
>                                                             [% END %]
>                                                                 No
>                                                         </label>
>                                                     [% ELSE %]
>-                                                        [% IF flagloo.yes %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
>+                                                        [% IF borrower_data.gonenoaddress %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
>                                                     [% END # /IF CAN_user_circulate_manage_restrictions %]
>                                                 </li>
>-                                            [% END # /FOREACH flagloo %]
>+                                            [% END # /UNLESS nogonenoaddress %]
>+                                            [% UNLESS nolost %]
>+                                                <li>
>+                                                    <label class="radio" for="yeslost">
>+                                                        Lost card:
>+                                                    </label>
>+                                                    [% IF CAN_user_circulate_manage_restrictions %]
>+                                                        <label for="yeslost">
>+                                                            [% IF ( borrower_data.lost ) %]
>+                                                                <input type="radio" id="yeslost" name="lost" value="1" checked="checked" />
>+                                                            [% ELSE %]
>+                                                                <input type="radio" id="yeslost" name="lost" value="1" />
>+                                                            [% END %]
>+                                                                Yes
>+                                                        </label>
>+                                                        <label for="nolost">
>+                                                            [% IF ( borrower_data.lost ) %]
>+                                                                <input type="radio" id="nolost" name="lost" value="0" />
>+                                                            [% ELSE %]
>+                                                                <input type="radio" id="nolost" name="lost" value="0" checked="checked"/>
>+                                                            [% END %]
>+                                                                No
>+                                                        </label>
>+                                                    [% ELSE %]
>+                                                        [% IF borrower_data.lost %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]
>+                                                    [% END # /IF CAN_user_circulate_manage_restrictions %]
>+                                                </li>
>+                                            [% END # /UNLESS nogonenoaddress %]
>                                         </ol>
>                                     </fieldset> 
> 
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 1b6aac6d1b..1aae4b0672 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -688,29 +688,6 @@ while (@relationships) {
>   push(@relshipdata, \%row);
> }
> 
>-my %flags = (
>-    'gonenoaddress' => ['gonenoaddress'],
>-    'lost'          => ['lost']
>-);
>-
>-my @flagdata;
>-foreach ( keys(%flags) ) {
>-    my $key = $_;
>-    my %row = (
>-        'key'  => $key,
>-        'name' => $flags{$key}[0]
>-    );
>-    if ( $data{$key} ) {
>-        $row{'yes'} = ' checked';
>-        $row{'no'}  = '';
>-    }
>-    else {
>-        $row{'yes'} = '';
>-        $row{'no'}  = ' checked';
>-    }
>-    push @flagdata, \%row;
>-}
>-
> # get Branch Loop
> # in modify mod: userbranch value comes from borrowers table
> # in add    mod: userbranch value comes from branches table (ip correspondence)
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31562: 140621 | 140622 | 140623 | 140624 | 140625 | 140626 | 140638 | 140639 | 140640 | 140655 | 140656 | 140657 | 142858