From d004f054384057f0c40f31137866ea3139fd2d52 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Wed, 21 Feb 2024 22:49:28 +0000
Subject: [PATCH] Bug 35067: Save a parent category for authorised value
 category

---
 admin/authorised_values.pl                    | 34 ++++++++++++-------
 .../en/modules/admin/authorised_values.tt     | 32 +++++++++++++----
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index c40158f15dd..f46539b51ee 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -67,6 +67,11 @@ if ($op eq 'add_form') {
         };
     }
 
+    my @category_names = Koha::AuthorisedValueCategories->search(
+        { category_name => { -not_in => [ '', 'branches', 'itemtypes', 'cn_source' ] } },
+        { order_by      => ['category_name'] }
+    )->as_list;
+
 	if ($id) {
 		$template->param(action_modify => 1);
    } elsif ( ! $category ) {
@@ -88,7 +93,8 @@ if ($op eq 'add_form') {
         );
     }
     $template->param(
-        branches_loop    => \@branches_loop,
+        branches_loop  => \@branches_loop,
+        category_names => \@category_names,
     );
 
 } elsif ($op eq 'cud-add') {
@@ -151,6 +157,7 @@ if ($op eq 'add_form') {
     $searchfield = $new_category;
 } elsif ($op eq 'cud-add_category' ) {
     my $new_category = $input->param('category');
+    my $parent       = $input->param('parent') || undef;
 
     my $already_exists = Koha::AuthorisedValueCategories->find(
         {
@@ -166,9 +173,12 @@ if ($op eq 'add_form') {
         }
     }
     else { # Insert
-        my $av = Koha::AuthorisedValueCategory->new( {
-            category_name => $new_category,
-        } );
+        my $av = Koha::AuthorisedValueCategory->new(
+            {
+                category_name => $new_category,
+                parent        => $parent,
+            }
+        );
 
         eval {
             $av->store;
@@ -206,21 +216,21 @@ if ($op eq 'add_form') {
     $op = 'list';
 }
 
+my $avc = Koha::AuthorisedValueCategories->find( $searchfield );
+
 $template->param(
-    op => $op,
+    op          => $op,
     searchfield => $searchfield,
-    messages => \@messages,
+    messages    => \@messages,
+    avc         => $avc,
 );
 
 if ( $op eq 'list' ) {
     # build categories list
     my @category_names = Koha::AuthorisedValueCategories->search(
-        {
-            category_name =>
-              { -not_in => [ '', 'branches', 'itemtypes', 'cn_source' ] }
-        },
-        { order_by => ['category_name'] }
-    )->get_column('category_name');
+        { category_name => { -not_in => [ '', 'branches', 'itemtypes', 'cn_source' ] } },
+        { order_by      => ['category_name'] }
+    )->as_list;
 
     $searchfield ||= "";
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index 11ccab61a5a..e31befcfea0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -134,6 +134,14 @@
                                         <span class="required">Required</span>
                                         <input type="hidden" name="op" value="cud-add_category" />
                                     </li>
+                                    <li>
+                                        <label for="parent">Parent category:</label>
+                                        <select name="parent" id="parent_auth_value_categories">
+                                            [% FOR c IN category_names %]
+                                                <option value="[% c.category_name | html %]">[% c.category_name | html %]</option>
+                                            [% END %]
+                                        </select>
+                                    </li>
                                 </ol>
                             [% ELSE %]
                                 <ol>
@@ -247,16 +255,20 @@
                                 <label for="category_search">Show category: </label>
                                 <select name="searchfield" id="category_search">
                                     [% FOR c IN category_names %]
-                                        [% IF c == searchfield %]
-                                            <option value="[% c | html %]" selected="selected">[% c | html %]</option>
+                                        [% IF c.category_name == searchfield %]
+                                            <option value="[% c.category_name | html %]" selected="selected">[% c.category_name | html %]</option>
                                         [% ELSE %]
-                                            <option value="[% c | html %]">[% c | html %]</option>
+                                            <option value="[% c.category_name | html %]">[% c.category_name | html %]</option>
                                         [% END %]
                                     [% END %]
                                 </select>
                             </p>
                         </form> <!-- /#category -->
 
+                        [% IF avc.parent %]
+                            Show parent category: <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% avc.parent | uri %]">[% avc.parent | html %]</a>
+                        [% END %]
+
                         [% IF loop %]
                             <table id="categoriest" class="authorized_values_table">
                                 <thead>
@@ -336,18 +348,26 @@
                                 <tr>
                                     <th>Category</th>
                                     <th>Description</th>
+                                    <th>Parent category</th>
                                     <th class="noExport">&nbsp;</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 [% FOR c IN category_names %]
                                     <tr>
-                                        <td><a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% c | uri %]">[% c | html %]</a></td>
+                                        <td><a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% c.category_name | uri %]">[% c.category_name | html %]</a></td>
+                                        <td>
+                                            [% PROCESS category_descriptions code_category = c.category_name %]
+                                        </td>
                                         <td>
-                                            [% PROCESS category_descriptions code_category = c %]
+                                            [% IF c.parent %]
+                                                <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=[% c.parent | uri %]">[% c.parent | html %]</a>
+                                            [% ELSE %]
+                                                &nbsp;
+                                            [% END %]
                                         </td>
                                         <td>
-                                            <a id="addauth" class="btn btn-default btn-xs" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% c | uri %]"><i class="fa fa-plus"> </i> Add</a>
+                                            <a id="addauth" class="btn btn-default btn-xs" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% c.category_name | uri %]"><i class="fa fa-plus"> </i> Add</a>
                                         </td>
                                     </tr>
                                 [% END # /FOR c %]
-- 
2.30.2