From 8c6281f9856c7a08e86410f6d309d5788c937759 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 23 Sep 2021 13:23:44 +0000
Subject: [PATCH] Bug 29093: Interface changes

Show the TOC checkbox on OPAC and staff.

Test plan:
Add new article request on OPAC or staff. Tick checkbox.
Verify if TOC is Yes on opac-user or staff patron details.
Check the list view on circ/article-requests.pl.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 circ/request-article.pl                                    | 2 ++
 .../prog/en/includes/patron-article-requests.inc           | 5 +++++
 .../intranet-tmpl/prog/en/modules/circ/article-requests.tt | 2 ++
 .../intranet-tmpl/prog/en/modules/circ/request-article.tt  | 7 +++++++
 .../opac-tmpl/bootstrap/en/modules/opac-request-article.tt | 5 +++++
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt      | 5 +++++
 opac/opac-request-article.pl                               | 2 ++
 7 files changed, 28 insertions(+)

diff --git a/circ/request-article.pl b/circ/request-article.pl
index 1c92927b82..dbe91dd52f 100755
--- a/circ/request-article.pl
+++ b/circ/request-article.pl
@@ -71,6 +71,7 @@ if ( $action eq 'create' ) {
     my $chapters     = $cgi->param('chapters')     || undef;
     my $patron_notes = $cgi->param('patron_notes') || undef;
     my $format       = $cgi->param('format')       || undef;
+    my $toc_request  = $cgi->param('toc_request');
 
     try {
         my $ar = Koha::ArticleRequest->new(
@@ -88,6 +89,7 @@ if ( $action eq 'create' ) {
                 chapters       => $chapters,
                 patron_notes   => $patron_notes,
                 format         => $format,
+                toc_request    => $toc_request ? 1 : 0,
             }
         )->request;
     } catch {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
index a22325e785..7133512853 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
@@ -12,6 +12,7 @@
                 <th class="article-request-volume">Volume</th>
                 <th class="article-request-issue">Issue</th>
                 <th class="article-request-date">Date</th>
+                <th class="article-request-toc">TOC</th>
                 <th class="article-request-pages">Pages</th>
                 <th class="article-request-chapters">Chapters</th>
                 <th class="article-request-notes">Notes</th>
@@ -57,6 +58,10 @@
                         [% ar.date | html %]
                     </td>
 
+                    <td class="article-request-toc">
+                        [% IF ar.toc_request %]Yes[% END %]
+                    </td>
+
                     <td class="article-request-pages">
                         [% ar.pages | html %]
                     </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
index 0e4301e860..44a14123bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
@@ -353,6 +353,7 @@
                                             </p>
                                         </td>
                                         <td class="ar-request">
+                                            [% IF ar.toc_request %]  <p><strong>Include TOC</strong>                                </p> [% END %]
                                             [% IF ar.title %]        <p><strong>Title:</strong>        [% ar.title | html %]        </p> [% END %]
                                             [% IF ar.author %]       <p><strong>Author:</strong>       [% ar.author | html %]       </p> [% END %]
                                             [% IF ar.volume %]       <p><strong>Volume:</strong>       [% ar.volume | html %]       </p> [% END %]
@@ -456,6 +457,7 @@
                                             </p>
                                         </td>
                                         <td class="ar-request">
+                                            [% IF ar.toc_request %]  <p><strong>Include TOC</strong>                                </p> [% END %]
                                             [% IF ar.title %]        <p><strong>Title:</strong>        [% ar.title | html %]        </p> [% END %]
                                             [% IF ar.author %]       <p><strong>Author:</strong>       [% ar.author | html %]       </p> [% END %]
                                             [% IF ar.volume %]       <p><strong>Volume:</strong>       [% ar.volume | html %]       </p> [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 5ab9d5a079..56536b9fbd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -177,6 +177,11 @@
                                             <input type="text" name="date" id="date" size="50"/>
                                         </li>
 
+                                        <li>
+                                            <label for="toc_request">Table of contents:</label>
+                                            <input type="checkbox" name="toc_request" value="1"/>
+                                        </li>
+
                                         <li>
                                             <label for="pages">Pages:</label>
                                             <input type="text" name="pages" id="pages" size="50"/>
@@ -299,6 +304,7 @@
                                     <th>Volume</th>
                                     <th>Issue</th>
                                     <th>Date</th>
+                                    <th>TOC</th>
                                     <th>Pages</th>
                                     <th>Chapters</th>
                                     <th>Patron notes</th>
@@ -318,6 +324,7 @@
                                         <td>[% ar.volume | html %]</td>
                                         <td>[% ar.issue | html %]</td>
                                         <td>[% ar.date | html %]</td>
+                                        <td>[% IF ar.toc_request %]Yes[% END %]</td>
                                         <td>[% ar.pages | html %]</td>
                                         <td>[% ar.chapters | html %]</td>
                                         <td>[% ar.patron_notes | html %]</td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
index dd646b4866..e51eb1bd66 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
@@ -114,6 +114,11 @@
                                         [% END %]
                                     </li>
 
+                                    <li>
+                                        <label for="toc_request">Table of contents:</label>
+                                        <input type="checkbox" name="toc_request" value="1"/>
+                                    </li>
+
                                     <li>
                                         [% IF mandatory_fields.search('pages') %]
                                             <label for="pages" class="required">Pages:</label>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 3c6bb1206d..1a383f7551 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -777,6 +777,7 @@
                                                 <th class="article-request-volume">Volume</th>
                                                 <th class="article-request-issue">Issue</th>
                                                 <th class="article-request-date">Date</th>
+                                                <th class="article-request-toc">TOC</th>
                                                 <th class="article-request-pages">Pages</th>
                                                 <th class="article-request-chapters">Chapters</th>
                                                 <th class="article-request-patron-notes">Notes</th>
@@ -822,6 +823,10 @@
                                                     [% ar.date | html %]
                                                 </td>
 
+                                                <td class="article-request-toc">
+                                                    [% IF ar.toc_request %]Yes[% END %]
+                                                </td>
+
                                                 <td class="article-request-pages">
                                                     [% ar.pages | html %]
                                                 </td>
diff --git a/opac/opac-request-article.pl b/opac/opac-request-article.pl
index b6048cc8c2..1ef7184e0b 100755
--- a/opac/opac-request-article.pl
+++ b/opac/opac-request-article.pl
@@ -62,6 +62,7 @@ if ( $action eq 'create' ) {
     my $chapters     = $cgi->param('chapters')     || undef;
     my $patron_notes = $cgi->param('patron_notes') || undef;
     my $format       = $cgi->param('format')       || undef;
+    my $toc_request  = $cgi->param('toc_request');
 
 
     my $success;
@@ -82,6 +83,7 @@ if ( $action eq 'create' ) {
                 chapters       => $chapters,
                 patron_notes   => $patron_notes,
                 format         => $format,
+                toc_request    => $toc_request ? 1 : 0,
             }
         )->request;
         $success = 1;
-- 
2.39.5