From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 6 Jun 2018 14:50:34 +0000 (-0400)
Subject: JBAS-2045 Remove gender field / stat cat data
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f920620ce4689b33f4a6e21be06bd3b2d107cd7a;p=working%2FEvergreen.git

JBAS-2045 Remove gender field / stat cat data

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/KCLS/openils/var/templates_kcls/opac/register.tt2 b/KCLS/openils/var/templates_kcls/opac/register.tt2
index 7b2a810c94..90b5b63563 100644
--- a/KCLS/openils/var/templates_kcls/opac/register.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/register.tt2
@@ -462,11 +462,6 @@ END; # input_field()
         </li>
 
         <li>
-          <label>Optional: What is your gender identity?</label>
-          <div>[% input_field('stgsc', '1', 'Gender') %]</div>
-        </li>
-
-        <li>
           <label class="gfield_label" for="">
             If you are under age 18, list all parents<br/>and guardians living at your address:
           </label>
diff --git a/KCLS/sql/schema/deploy/remove-gender.sql b/KCLS/sql/schema/deploy/remove-gender.sql
new file mode 100644
index 0000000000..c42ab570d4
--- /dev/null
+++ b/KCLS/sql/schema/deploy/remove-gender.sql
@@ -0,0 +1,10 @@
+-- Deploy kcls-evergreen:remove-gender to pg
+-- requires: ecard-data
+
+BEGIN;
+
+DELETE FROM actor.stat_cat_entry_usr_map WHERE stat_cat = 1;
+DELETE FROM actor.stat_cat_entry WHERE stat_cat = 1;
+DELETE FROM actor.stat_cat WHERE id = 1;
+
+COMMIT;
diff --git a/KCLS/sql/schema/revert/remove-gender.sql b/KCLS/sql/schema/revert/remove-gender.sql
new file mode 100644
index 0000000000..182628176a
--- /dev/null
+++ b/KCLS/sql/schema/revert/remove-gender.sql
@@ -0,0 +1,15 @@
+-- Revert kcls-evergreen:remove-gender from pg
+
+BEGIN;
+
+-- We can recover the stat cats, but not the data.
+
+INSERT INTO actor.stat_cat (id, owner, name, opac_visible, usr_summary, 
+    checkout_archive, required, allow_freetext)
+VALUES (1, 1, 'Gender', FALSE, TRUE, FALSE, FALSE, TRUE);
+
+INSERT INTO actor.stat_cat_entry (stat_cat, owner, value) VALUES 
+    (1, 1, 'M (Male)'), (1, 1, 'F (Female)'), (1, 1, '- (Undeclared)');
+
+COMMIT;
+
diff --git a/KCLS/sql/schema/sqitch.plan b/KCLS/sql/schema/sqitch.plan
index 9e9795d157..b758b3ac51 100644
--- a/KCLS/sql/schema/sqitch.plan
+++ b/KCLS/sql/schema/sqitch.plan
@@ -70,3 +70,4 @@ track-bib-merges [vand-import-edit-date-fix] 2018-04-03T15:04:00Z Bill Erickson,
 search-index-keep-periods [vand-import-edit-date-fix] 2018-04-02T19:10:31Z Bill Erickson,,, <berick@kcls-dev-local> # Avoid stripping periods in search indexes
 acq-inv-close-fields [search-index-keep-periods] 2018-04-12T19:03:29Z Bill Erickson,,, <berick@kcls-dev-local> # Invoice export by/date fields
 ecard-data [2.10-to-2.12-upgrade] 2018-01-03T21:55:03Z Bill Erickson,,, <berick@kcls-dev-local> # Ecard lib settings, policy data, etc.
+remove-gender [ecard-data] 2018-06-06T14:44:36Z Bill Erickson,,, <berick@kcls-dev-local> # Remove gender field/data
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
index 92f48267b1..d074951471 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
@@ -320,12 +320,6 @@ sub handle_stat_cats {
             "registering user with stat cat values $_ => ".$cgi->param($_));
     }
 
-    # Gender
-    my $stat_cat = Fieldmapper::staging::statcat_stage->new;
-    $stat_cat->statcat(1);
-    $stat_cat->value($cgi->param('stgsc.1'));
-    push(@$stat_cats, $stat_cat);
-
     if (my $pickup_auth = $cgi->param('stgsc.5')) {
         my $stat_cat = Fieldmapper::staging::statcat_stage->new;
         $stat_cat->statcat(5);
@@ -341,7 +335,7 @@ sub handle_stat_cats {
     }
 
     # Events mailing
-    $stat_cat = Fieldmapper::staging::statcat_stage->new;
+    my $stat_cat = Fieldmapper::staging::statcat_stage->new;
     $stat_cat->statcat(3);
     $stat_cat->value((grep {$_ eq 'stgsc.3'} $cgi->param) ? 'Y' : 'N');
     push(@$stat_cats, $stat_cat);