From 27ed05493351ca39b498d796b48c56f385871a85 Mon Sep 17 00:00:00 2001
From: David Roberts <david@koha-ptfs.co.uk>
Date: Mon, 4 May 2020 02:29:14 +0000
Subject: [PATCH] Bug 25364: Add "Other" to the gender options in a patron
 record

This patch adds "Other" as an option, and also changes the wording of
"None specified" slightly.

To test:

1) Apply the patch
2) Check that there is an "Other" radio button in the patron record, and
that the wording of "None specified" has changed to "None specified /
Prefer not to say".
3) Check that you can save changes to the gender of this patron record,
both on create and modify.
4) Check that these changes also work in the Opac Self-Registration
functionality.
---
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt    |  9 +++++++--
 .../intranet-tmpl/prog/en/modules/members/moremember-brief.tt  |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt  |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt   | 10 +++++++++-
 4 files changed, 18 insertions(+), 5 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 4b5eb35d12..2c129d6246 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -374,10 +374,15 @@ legend:hover {
                                                             [% ELSE %]
                                                                 <label for="sex-male"><input type="radio" name="sex" id="sex-male" value="M" /> Male</label>
                                                             [% END %]
+                                                            [% IF ( other ) %]
+                                                                <label for="sex-other"><input type="radio" name="sex" id="sex-other" value="O" checked="checked" /> Other</label>
+                                                            [% ELSE %]
+                                                                <label for="sex-other"><input type="radio" name="sex" id="sex-other" value="O" /> Other</label>
+                                                            [% END %]
                                                             [% IF ( none ) %]
-                                                                <label for="sex-none"><input type="radio" name="sex" id="sex-none" value=""  checked="checked" /> None specified</label>
+                                                                <label for="sex-none"><input type="radio" name="sex" id="sex-none" value=""  checked="checked" /> None specified / Prefer not to say</label>
                                                             [% ELSE %]
-                                                                <label for="sex-none"><input type="radio" name="sex" id="sex-none" value="" /> None specified</label>
+                                                                <label for="sex-none"><input type="radio" name="sex" id="sex-none" value="" /> None specified / Prefer not to say</label>
                                                             [% END %]
                                                         [% ELSE %]
                                                             <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 2eded98efb..3abf6c70c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -39,7 +39,7 @@
             [% UNLESS ( I ) %]
                 [% IF ( patron.initials ) %]<li><span class="label">Initials: </span>[% patron.initials | html %]</li>[% END %]
                 [% IF ( patron.dateofbirth ) %]<li><span class="label">Date of birth:</span>[% patron.dateofbirth | $KohaDates %]</li>[% END %]
-                [% IF ( patron.sex ) %]<li><span class="label">Gender:</span>[% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex | html %][% END %]</li>[% END %]
+                [% IF ( patron.sex ) %]<li><span class="label">Gender:</span>[% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSIF ( patron.sex == 'O' ) %]Other[% ELSE %][% patron.sex | html %][% END %]</li>[% END %]
             [% END %]
 
             [% IF guarantees %]
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 8321edef92..96821c962a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -246,7 +246,7 @@
                                             [% IF ( patron.sex ) %]
                                                 <li>
                                                     <span class="label">Gender:</span>
-                                                    [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex | html %][% END %]
+                                                    [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSIF (patron.sex == 'O' ) %]Other[% ELSE %][% patron.sex | html %][% END %]
                                                 </li>
                                             [% END %]
                                         [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index 35af40224f..6be8fd0b98 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -386,7 +386,15 @@
                                                 <input type="radio" name="borrower_sex" id="sex-male" value="M" />
                                             [% END %]
 
-                                            <label for="sex-none" class="radio inline">None specified: </label>
+                                            <label for="sex-other" class="radio inline">Other:</label>
+                                            [% IF borrower.sex == 'O' %]
+                                                <input type="radio" name="borrower_sex" id="sex-other" value="O" checked="checked" />
+                                            [% ELSE %]
+                                                <input type="radio" name="borrower_sex" id="sex-other" value="O" />
+                                            [% END %]
+
+
+                                            <label for="sex-none" class="radio inline">None specified / Prefer not to say: </label>
                                             [% IF borrower.sex == '' %]
                                                 <input type="radio" name="borrower_sex" id="sex-none" value="" checked="checked" />
                                             [% ELSE %]
-- 
2.11.0