From b565ef003399058552a820ffa09bd4f90c46265a Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Thu, 24 Jun 2021 15:26:36 -0400 Subject: [PATCH] LP1906855 Show Covers in My Account Adds covers to current circs, circ history, current holds, holds history, and list tables. Signed-off-by: Terran McCanna Signed-off-by: Mary Llewellyn Signed-off-by: Galen Charlton --- .../opac/css/mediaQuery.css.tt2 | 73 ++++++++++++---------- .../opac/myopac/circ_history.tt2 | 12 ++++ .../src/templates-bootstrap/opac/myopac/circs.tt2 | 12 ++++ .../opac/myopac/hold_history.tt2 | 13 +++- .../src/templates-bootstrap/opac/myopac/holds.tt2 | 12 ++++ .../src/templates-bootstrap/opac/myopac/lists.tt2 | 14 +++++ .../templates-bootstrap/opac/parts/misc_util.tt2 | 20 ++++++ 7 files changed, 121 insertions(+), 35 deletions(-) diff --git a/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 index 61055439c9..538087b14c 100644 --- a/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 @@ -100,19 +100,21 @@ only screen and (max-width: 650px) { .chargesMainTable td:nth-of-type(7):before { content: "Returned/Renewed"; display: flex;} .activeHoldstable td:nth-of-type(1):before { content: "Select"; display: flex; } - .activeHoldstable td:nth-of-type(2):before { content: "Title"; display: flex; } - .activeHoldstable td:nth-of-type(3):before { content: "Author"; display: flex;} - .activeHoldstable td:nth-of-type(4):before { content: "Format"; display: flex;} - .activeHoldstable td:nth-of-type(5):before { content: "Pickup Location"; display: flex;} - .activeHoldstable td:nth-of-type(6):before { content: "Cancel If Not Filled By"; display: flex;} - .activeHoldstable td:nth-of-type(7):before { content: "Status"; display: flex;} - .activeHoldstable td:nth-of-type(8):before { content: "Notes"; display: flex;} - - .holdHistoryTable td:nth-of-type(1):before { content: "Title"; display: flex; } - .holdHistoryTable td:nth-of-type(2):before { content: "Author"; display: flex; } - .holdHistoryTable td:nth-of-type(3):before { content: "Format"; display: flex; } - .holdHistoryTable td:nth-of-type(4):before { content: "Pickup Location"; display: flex; } - .holdHistoryTable td:nth-of-type(5):before { content: "Status"; display: flex; } + .activeHoldstable td:nth-of-type(2):before { content: "Cover"; display: flex; } + .activeHoldstable td:nth-of-type(3):before { content: "Title"; display: flex; } + .activeHoldstable td:nth-of-type(4):before { content: "Author"; display: flex;} + .activeHoldstable td:nth-of-type(5):before { content: "Format"; display: flex;} + .activeHoldstable td:nth-of-type(6):before { content: "Pickup Location"; display: flex;} + .activeHoldstable td:nth-of-type(7):before { content: "Cancel If Not Filled By"; display: flex;} + .activeHoldstable td:nth-of-type(8):before { content: "Status"; display: flex;} + .activeHoldstable td:nth-of-type(9):before { content: "Notes"; display: flex;} + + .holdHistoryTable td:nth-of-type(1):before { content: "Cover"; display: flex; } + .holdHistoryTable td:nth-of-type(2):before { content: "Title"; display: flex; } + .holdHistoryTable td:nth-of-type(3):before { content: "Author"; display: flex; } + .holdHistoryTable td:nth-of-type(4):before { content: "Format"; display: flex; } + .holdHistoryTable td:nth-of-type(5):before { content: "Pickup Location"; display: flex; } + .holdHistoryTable td:nth-of-type(6):before { content: "Status"; display: flex; } .paymentTable td:nth-of-type(1):before { content: "Payment Date"; display: flex; } .paymentTable td:nth-of-type(2):before { content: "Payment For"; display: flex; } @@ -126,29 +128,32 @@ only screen and (max-width: 650px) { .messagesTable td:nth-of-type(5):before { content: ""; display: flex; } .circTable td:nth-of-type(1):before { content: "Select"; display: flex; } - .circTable td:nth-of-type(2):before { content: "Title"; display: flex; } - .circTable td:nth-of-type(3):before { content: "Author"; display: flex; } - .circTable td:nth-of-type(4):before { content: "Renewals Left"; display: flex; } - .circTable td:nth-of-type(5):before { content: "Due Date"; display: flex; } - .circTable td:nth-of-type(6):before { content: "Barcode"; display: flex; } - .circTable td:nth-of-type(7):before { content: "Call Number"; display: flex; } + .circTable td:nth-of-type(2):before { content: "Cover"; display: flex; } + .circTable td:nth-of-type(3):before { content: "Title"; display: flex; } + .circTable td:nth-of-type(4):before { content: "Author"; display: flex; } + .circTable td:nth-of-type(5):before { content: "Renewals Left"; display: flex; } + .circTable td:nth-of-type(6):before { content: "Due Date"; display: flex; } + .circTable td:nth-of-type(7):before { content: "Barcode"; display: flex; } + .circTable td:nth-of-type(8):before { content: "Call Number"; display: flex; } .circHistTable td:nth-of-type(1):before { content: "Select"; display: flex; } - .circHistTable td:nth-of-type(2):before { content: "Title"; display: flex; } - .circHistTable td:nth-of-type(3):before { content: "Author"; display: flex; } - .circHistTable td:nth-of-type(4):before { content: "Checkout Date"; display: flex; } - .circHistTable td:nth-of-type(5):before { content: "Due Date"; display: flex; } - .circHistTable td:nth-of-type(6):before { content: "Date Returned"; display: flex; } - .circHistTable td:nth-of-type(7):before { content: "Barcode"; display: flex; } - .circHistTable td:nth-of-type(8):before { content: "Call Number"; display: flex; } - - .bookbagTable td:nth-of-type(1):before { content: ""; display: flex; } - .bookbagTable td:nth-of-type(2):before { content: "Title"; display: flex; } - .bookbagTable td:nth-of-type(3):before { content: "Author(s)"; display: flex; } - .bookbagTable td:nth-of-type(4):before { content: "Local Call number"; display: flex; } - .bookbagTable td:nth-of-type(5):before { content: "Publication Date"; display: flex; } - .bookbagTable td:nth-of-type(6):before { content: "Format"; display: flex; } - .bookbagTable td:nth-of-type(7):before { content: "Notes"; display: flex; } + .circHistTable td:nth-of-type(2):before { content: "Cover"; display: flex; } + .circHistTable td:nth-of-type(3):before { content: "Title"; display: flex; } + .circHistTable td:nth-of-type(4):before { content: "Author"; display: flex; } + .circHistTable td:nth-of-type(5):before { content: "Checkout Date"; display: flex; } + .circHistTable td:nth-of-type(6):before { content: "Due Date"; display: flex; } + .circHistTable td:nth-of-type(7):before { content: "Date Returned"; display: flex; } + .circHistTable td:nth-of-type(8):before { content: "Barcode"; display: flex; } + .circHistTable td:nth-of-type(9):before { content: "Call Number"; display: flex; } + + .bookbagTable td:nth-of-type(1):before { content: "Select"; display: flex; } + .bookbagTable td:nth-of-type(2):before { content: "Cover"; display: flex; } + .bookbagTable td:nth-of-type(3):before { content: "Title"; display: flex; } + .bookbagTable td:nth-of-type(4):before { content: "Author(s)"; display: flex; } + .bookbagTable td:nth-of-type(5):before { content: "Local Call number"; display: flex; } + .bookbagTable td:nth-of-type(6):before { content: "Publication Date"; display: flex; } + .bookbagTable td:nth-of-type(7):before { content: "Format"; display: flex; } + .bookbagTable td:nth-of-type(8):before { content: "Notes"; display: flex; } .eholdsTable td:nth-of-type(1):before { content: "Title"; display: flex; } .eholdsTable td:nth-of-type(2):before { content: "Author"; display: flex; } diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 index 0c14daa149..c057a4a9e4 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 @@ -53,6 +53,7 @@ + [% l("Cover") %] [% sort_head("sort_title", l("Title")) %] [% sort_head("author", l("Author")) %] [% sort_head("callnum", l("Call Number")) %] @@ -129,6 +130,17 @@ + [% IF circ.ATTRS.issns.0; + row_isbnissn = circ.ATTRS.issns.0; + ELSIF circ.ATTRS.isbns.0; + row_isbnissn = circ.ATTRS.isbns.0; + ELSE; + row_isbnissn = ''; + END; + row_rec_id = circ.circ.target_copy.call_number.record.id; + row_title = circ.ATTRS.title; + PROCESS show_cover; + %] [% IF circ.circ.target_copy.call_number.id == -1 %] [% circ.circ.target_copy.dummy_title | html %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 index 91f8d33a9f..a636cdabe5 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 @@ -44,6 +44,7 @@ onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'circ' && !inputs[i].disabled) inputs[i].checked = this.checked;}" /> + [% l("Cover") %] [% sort_head("sort_title", l("Title")) %] [% sort_head("author", l("Author")) %] [% sort_head("renews", l("Renewals Left")) %] @@ -123,6 +124,17 @@ [% IF circ.circ.renewal_remaining < 1 %] disabled="disabled" [% END %] value="[% circ.circ.id %]" /> + [% IF circ.ATTRS.issns.0; + row_isbnissn = circ.ATTRS.issns.0; + ELSIF circ.ATTRS.isbns.0; + row_isbnissn = circ.ATTRS.isbns.0; + ELSE; + row_isbnissn = ''; + END; + row_rec_id = circ.circ.target_copy.call_number.record.id; + row_title = circ.ATTRS.title; + PROCESS show_cover; + %] Title [% IF circ.circ.target_copy.call_number.id == -1 %] diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 index 26830994c9..ff0b543b7e 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 @@ -50,6 +50,7 @@ + @@ -64,7 +65,17 @@ ahr = hold.hold.hold %] - + [% IF hold.ATTRS.issns.0; + row_isbnissn = hold.ATTRS.issns.0; + ELSIF hold.ATTRS.isbns.0; + row_isbnissn = hold.ATTRS.isbns.0; + ELSE; + row_isbnissn = ''; + END; + row_rec_id = hold.hold.bre_id; + row_title = hold.ATTRS.title; + PROCESS show_cover; + %] + @@ -156,6 +157,17 @@ + [% IF hold.ATTRS.issns.0; + row_isbnissn = hold.ATTRS.issns.0; + ELSIF hold.ATTRS.isbns.0; + row_isbnissn = hold.ATTRS.isbns.0; + ELSE; + row_isbnissn = ''; + END; + row_rec_id = hold.hold.bre_id; + row_title = hold.ATTRS.title; + PROCESS show_cover; + %] + + [% IF attrs.issns.0; + row_isbnissn = attrs.issns.0; + ELSIF attrs.0; + row_isbnissn = attrs.isbns.0; + ELSE; + row_isbnissn = ''; + END; + row_rec_id = rec_id; + row_title = attrs.title; + PROCESS show_cover; + %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 index a37490248f..86f267dda1 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/misc_util.tt2 @@ -888,3 +888,23 @@ [% END -%] [% END -%] + +[% BLOCK show_cover %] + +[% END %] + + + -- 2.11.0
[% l("Cover") %] [% l('Title') %] [% l('Author') %] [% l('Format') %]
Title
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 index 07130d39f3..590253e901 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 @@ -81,6 +81,7 @@
[% l("Cover") %] [% sort_head("sort_title", l('Title')) %] [% sort_head("author", l('Author')) %] [% sort_head("format", l('Format')) %] Title
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 index 3735e18b71..4ddd11f4b8 100755 --- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 @@ -296,6 +296,9 @@
+ [% l("Cover") %] + [% l('Title') %] @@ -332,6 +335,17 @@ [% attrs.title | html %] + [% l('Cover Image') %] + [% IF obalkyknih_cz.enabled == 'true' %] + [% IF (matches = row_isbnissn.match('^(.+?)(\s.+)$')); + row_isbnissn = matches.0; + END %] + + [% ELSE %] + + [% END %] + [% row_title _ ' Cover Image' %] + +