From 0f652daccb6f6a27b78c4bafd41c317e14f9bb15 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 9 Apr 2020 13:22:01 -0400
Subject: [PATCH] Bug 25101: Add ability to skip previewing results when batch
 extending due dates

For sites with very large amounts of due dates to extend ( tens of thousands ), it can take a very long time of the results to load ( if at all ). It would be good to have a way to bypass the confirmation screen, instead directly updating the due dates before displaying the results.

Test Plan:
1) Apply this patch
2) Browse to tools/batch_extend_due_dates.pl
3) Note the new "Preview results" checkbox
4) Submit form with the checkbox unchecked, due dates should be updated
   without previewing the checkouts
5) Submit form with the checkbox checked, tool should function as
   it did previously

Signed-off-by: Kelly McElligott <kelly@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Bug 25101: (QA follow-up) Add hint to new option

Adds a hint about the large numbers behind the new
checkbox option.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Bug 25101: (QA follow-up) Fix hint for new option
---
 .../modules/tools/batch_extend_due_dates.tt   | 10 ++++
 tools/batch_extend_due_dates.pl               | 60 +++++++++++++------
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
index 3736f99d40..0a4d76ef5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
@@ -97,6 +97,16 @@
                                     </li>
                                 </ol>
                             </fieldset>
+                            <fieldset class="rows">
+                                <legend>Options:</legend>
+                                <ol>
+                                    <li>
+                                        <label for="preview_results">Preview results:</label>
+                                        <input type="checkbox" name="preview_results" id="preview_results" />
+                                        <span class="hint">This is not recommended when changing very large numbers of due dates.</span>
+                                    </li>
+                                </ol>
+                            </fieldset>
                             <fieldset class="action">
                                 <input type="hidden" name="op" value="list" />
                                 <input type="submit" value="Continue" class="button" />
diff --git a/tools/batch_extend_due_dates.pl b/tools/batch_extend_due_dates.pl
index 572e57bdc9..4cf4cfbf63 100755
--- a/tools/batch_extend_due_dates.pl
+++ b/tools/batch_extend_due_dates.pl
@@ -29,6 +29,7 @@ use Koha::DateUtils qw( dt_from_string output_pref );
 
 my $input = new CGI;
 my $op = $input->param('op') // q|form|;
+my $preview_results = $input->param('preview_results');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -40,6 +41,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
+my @issue_ids;
+
 if ( $op eq 'form' ) {
     $template->param( view => 'form', );
 }
@@ -102,33 +105,52 @@ elsif ( $op eq 'list' ) {
 
     my @new_due_dates;
     while ( my $checkout = $checkouts->next ) {
-        push @new_due_dates,
-          output_pref({ dt => calc_new_due_date(
-            {
-                due_date          => dt_from_string($checkout->date_due),
-                new_hard_due_date => $new_hard_due_date,
-                add_days          => $due_date_days
-            }
-          ), dateformat => 'iso' });
+        if ($preview_results) {
+            push(
+                @new_due_dates,
+                output_pref(
+                    {
+                        dt => calc_new_due_date(
+                            {
+                                due_date =>
+                                  dt_from_string( $checkout->date_due ),
+                                new_hard_due_date => $new_hard_due_date,
+                                add_days          => $due_date_days
+                            }
+                        ),
+                        dateformat => 'iso'
+                    }
+                )
+            );
+        } else {
+            push( @issue_ids, $checkout->id );
+        }
     }
 
-    $template->param(
-        checkouts         => $checkouts,
-        new_hard_due_date => $new_hard_due_date
-        ? dt_from_string($new_hard_due_date)
-        : undef,
-        due_date_days => $due_date_days,
-        new_due_dates => \@new_due_dates,
-        view          => 'list',
-    );
+    if ( $preview_results ) {
+        $template->param(
+            checkouts         => $checkouts,
+            new_hard_due_date => $new_hard_due_date
+            ? dt_from_string($new_hard_due_date)
+            : undef,
+            due_date_days => $due_date_days,
+            new_due_dates => \@new_due_dates,
+            view          => 'list',
+        );
+    } else {
+        $op = 'modify';
+    }
 }
-elsif ( $op eq 'modify' ) {
+
+if ( $op eq 'modify' ) {
 
     # We want to modify selected checkouts!
-    my @issue_ids         = $input->multi_param('issue_id');
     my $new_hard_due_date = $input->param('new_hard_due_date');
     my $due_date_days     = $input->param('due_date_days');
 
+    # @issue_ids will already be populated if we are skipping the results display
+    @issue_ids = $input->multi_param('issue_id') unless @issue_ids;
+
     $new_hard_due_date &&= dt_from_string($new_hard_due_date);
     my $checkouts =
       Koha::Checkouts->search( { issue_id => { -in => \@issue_ids } } );
-- 
2.20.1