From e9500f90806f129970ca452c072cdc844e876057 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 25 Sep 2018 18:40:28 +0000 Subject: [PATCH] Bug 21409: Add column configuration to course reserves This patch adds columns configuration and print/export options to two tables: The table listing courses and the table listing titles reserved for a course. To test you should have more than one course and multiple title reserved for at least one course. - Apply the patch and go to Course reserves - In the table of courses, confirm that all DataTables controls work correctly: paging, filter, column visibility, export, etc. - View a course with multiple titles reserved. Test all DataTables controls on this table too. - Go to Administration -> Columns settings - Change the settings for the courses and reserves table and confirm that these changes are applied correctly. Signed-off-by: Caroline Cyr La Rose Signed-off-by: Jonathan Druart --- admin/columns_settings.yml | 55 ++++++++++++++++++++++ .../prog/en/modules/admin/columns_settings.tt | 6 +++ .../en/modules/course_reserves/course-details.tt | 14 ++++-- .../en/modules/course_reserves/course-reserves.tt | 14 ++++-- 4 files changed, 79 insertions(+), 10 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 57bc3992ab..4cf88e8b7b 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -201,6 +201,61 @@ modules: - columnname: stocknumber + coursereserves: + courses: + course_reserves_table: + - + columnname: name + - + columnname: department + - + columnname: course_no + - + columnname: section + - + columnname: term + - + columnname: instructors + - + columnname: staff_note + - + columnname: public_note + - + columnname: no_of_students + - + columnname: enabled + + reserves: + course_reserves_table: + - + columnname: title + - + columnname: author + - + columnname: barcode + - + columnname: call_number + - + columnname: item_type + - + columnname: collection + - + columnname: location + - + columnname: library + - + columnname: staff_note + - + columnname: public_note + - + columnname: link + - + columnname: other_course_reserves + - + columnname: actions + cannot_be_toggled: 1 + cannot_be_modified: 1 + members: fines: account-fines: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index ebcd53e1c0..2c011dd380 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -140,6 +140,12 @@ [% PROCESS pagelist module=modules.circ modulename="circ" %] +

Course reserves

+
+

Course reserves tables

+ [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %] +
+

Patrons

Patrons tables

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index f43eb90df9..86a9a2ecb9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -3,6 +3,7 @@ [% USE AuthorisedValues %] [% USE ItemTypes %] [% USE Branches %] +[% USE ColumnsSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Course reserves › Course details for [% course.course_name | html %] @@ -20,7 +21,7 @@
-
+
[% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
@@ -53,8 +54,8 @@
[% IF course_reserves %] +

Reserves

- @@ -202,15 +203,18 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - [% END %] -- 2.11.0
Reserves
Title