From d51c07efb74aa529734107ae5f41a92a677d6df2 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 17 Apr 2012 08:07:32 -0400 Subject: [PATCH] Bug 8215 - Course Reserves Adds a course reserves system for academic libraries. The course reserves system allows libraries to create courses and put items on reserves for those courses. Each item with at least one reserve can have some of its attributes modified while it is on reserve for at least one active course. These attributes include item type, collection code, shelving location, and holding library. If there are no active courses with this item on reserve, it's attributes will revert to the original attributes it had before going on reserve. Test Plan: 1) Create new authorised value categories DEPARTMENT and TERM 2) Create a new course, add instructors to that course. 3) Reserve items for that course, verify item attributes have changed. 4) Disable course, verify item attributes have reverted. 5) Enable course again, verify item attributes again. 6) Delete course, verify item attributes again. 7) Create two new courses, add the same item(s) to both courses. 8) Disable one course, verify item attributes have not reverted. 9) Disable both courses, verify item attributes have reverted. 10) Enable one course, verify item attributes are again set to the new values. 11) Edit reserve item attributes, verify. 12) Disable all courses, edit reserve item attributes, verify the item itself still has its original attributes, verify the reserve item attributes have been updated. 13) Verify the ability to remove instructors from a course. 14) Verify new permissions, top level coursereserves, with subpermissions add_reserves and delete_reserves. --- C4/Auth.pm | 2 + C4/CourseReserves.pm | 1122 ++++++++++++++++++++ C4/Koha.pm | 22 +- Koha/Template/Plugin/AuthorisedValues.pm | 34 + Koha/Template/Plugin/Branches.pm | 37 + Koha/Template/Plugin/ItemTypes.pm | 38 + Makefile.PL | 1 + admin/authorised_values.pl | 2 +- catalogue/detail.pl | 5 + course_reserves/add_items.pl | 97 ++ course_reserves/course-details.pl | 67 ++ course_reserves/course-reserves.pl | 54 + course_reserves/course.pl | 55 + course_reserves/mod_course.pl | 72 ++ installer/data/mysql/de-DE/mandatory/userflags.sql | 1 + .../data/mysql/de-DE/mandatory/userpermissions.sql | 5 +- installer/data/mysql/en/mandatory/userflags.sql | 1 + .../data/mysql/en/mandatory/userpermissions.sql | 5 +- installer/data/mysql/es-ES/mandatory/userflags.sql | 1 + .../data/mysql/es-ES/mandatory/userpermissions.sql | 5 +- .../data/mysql/fr-FR/1-Obligatoire/userflags.sql | 1 + .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 6 +- installer/data/mysql/it-IT/necessari/userflags.sql | 1 + .../data/mysql/it-IT/necessari/userpermissions.sql | 5 +- installer/data/mysql/kohastructure.sql | 102 ++ .../data/mysql/nb-NO/1-Obligatorisk/userflags.sql | 1 + .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 5 +- installer/data/mysql/pl-PL/mandatory/userflags.sql | 1 + .../data/mysql/pl-PL/mandatory/userpermissions.sql | 5 +- .../ru-RU/mandatory/permissions_and_user_flags.sql | 8 +- installer/data/mysql/sysprefs.sql | 1 + .../uk-UA/mandatory/permissions_and_user_flags.sql | 8 +- installer/data/mysql/updatedatabase.pl | 93 ++- .../intranet-tmpl/prog/en/css/staff-global.css | 4 +- .../intranet-tmpl/prog/en/includes/header.inc | 5 +- koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 6 +- .../en/modules/admin/preferences/circulation.pref | 7 + .../prog/en/modules/catalogue/detail.tt | 34 + .../prog/en/modules/cataloguing/additem.tt | 2 +- .../en/modules/course_reserves/add_items-step1.tt | 63 ++ .../en/modules/course_reserves/add_items-step2.tt | 133 +++ .../en/modules/course_reserves/course-details.tt | 185 ++++ .../en/modules/course_reserves/course-reserves.tt | 119 +++ .../prog/en/modules/course_reserves/course.tt | 205 ++++ .../prog/en/modules/members/mancredit.tt | 2 +- .../prog/en/modules/members/maninvoice.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 1 + koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 1 + .../prog/en/modules/opac-course-details.tt | 63 ++ .../prog/en/modules/opac-course-reserves.tt | 62 ++ koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 31 + opac/opac-course-details.pl | 60 ++ opac/opac-course-reserves.pl | 51 + opac/opac-detail.pl | 7 + t/db_dependent/CourseReserves.t | 88 ++ 56 files changed, 2966 insertions(+), 30 deletions(-) create mode 100644 C4/CourseReserves.pm create mode 100644 Koha/Template/Plugin/AuthorisedValues.pm create mode 100644 Koha/Template/Plugin/Branches.pm create mode 100644 Koha/Template/Plugin/ItemTypes.pm create mode 100755 course_reserves/add_items.pl create mode 100755 course_reserves/course-details.pl create mode 100755 course_reserves/course-reserves.pl create mode 100755 course_reserves/course.pl create mode 100755 course_reserves/mod_course.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt create mode 100755 opac/opac-course-details.pl create mode 100755 opac/opac-course-reserves.pl create mode 100755 t/db_dependent/CourseReserves.t diff --git a/C4/Auth.pm b/C4/Auth.pm index 27aa39b..2d87266 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -202,6 +202,7 @@ sub get_template_and_user { $template->param( CAN_user_serials => 1 ); $template->param( CAN_user_reports => 1 ); $template->param( CAN_user_staffaccess => 1 ); + $template->param( CAN_user_coursereserves => 1 ); foreach my $module (keys %$all_perms) { foreach my $subperm (keys %{ $all_perms->{$module} }) { $template->param( "CAN_user_${module}_${subperm}" => 1 ); @@ -335,6 +336,7 @@ sub get_template_and_user { noItemTypeImages => C4::Context->preference("noItemTypeImages"), marcflavour => C4::Context->preference("marcflavour"), persona => C4::Context->preference("persona"), + UseCourseReserves => C4::Context->preference("UseCourseReserves"), ); if ( $in->{'type'} eq "intranet" ) { $template->param( diff --git a/C4/CourseReserves.pm b/C4/CourseReserves.pm new file mode 100644 index 0000000..f8ebb26 --- /dev/null +++ b/C4/CourseReserves.pm @@ -0,0 +1,1122 @@ +package C4::CourseReserves; + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307 USA + +use Modern::Perl; + +require Exporter; + +use C4::Context; +use C4::Items qw(GetItem ModItem); +use C4::Biblio qw(GetBiblioFromItemNumber); +use C4::Circulation qw(GetOpenIssue); + +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG @FIELDS); + +BEGIN { + @ISA = qw(Exporter); + @EXPORT = qw( + &GetCourse + &ModCourse + &GetCourses + &DelCourse + + &GetCourseInstructors + &ModCourseInstructors + + &GetCourseItem + &ModCourseItem + + &GetCourseReserve + &ModCourseReserve + &GetCourseReserves + &DelCourseReserve + + &SearchCourses + + &GetItemReservesInfo + ); + + $DEBUG = 0; + @FIELDS = ( 'itype', 'ccode', 'holdingbranch', 'location' ); +} + +=head1 NAME + +C4::CourseReserves - Koha course reserves module + +=head1 SYNOPSIS + +use C4::CourseReserves; + +=head1 DESCRIPTION + +This module deals with course reserves. + +=head1 FUNCTIONS + +=head2 GetCourse + + $course = GetCourse( $course_id ); + +=cut + +sub GetCourse { + my ($course_id) = @_; + warn whoami() . "( $course_id )" if $DEBUG; + + my $query = "SELECT * FROM courses WHERE course_id = ?"; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute($course_id); + + my $course = $sth->fetchrow_hashref(); + + $query = " + SELECT b.* FROM course_instructors ci + LEFT JOIN borrowers b ON ( ci.borrowernumber = b.borrowernumber ) + WHERE course_id = ? + "; + $sth = $dbh->prepare($query); + $sth->execute($course_id); + $course->{'instructors'} = $sth->fetchall_arrayref( {} ); + + return $course; +} + +=head2 ModCourse + + ModCourse( [ course_id => $id ] [, course_name => $course_name ] [etc...] ); + +=cut + +sub ModCourse { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $dbh = C4::Context->dbh; + + my $course_id; + if ( defined $params{'course_id'} ) { + $course_id = $params{'course_id'}; + delete $params{'course_id'}; + } + + my @query_keys; + my @query_values; + + my $query; + + $query .= ($course_id) ? ' UPDATE ' : ' INSERT '; + $query .= ' courses SET '; + + foreach my $key ( keys %params ) { + push( @query_keys, "$key=?" ); + push( @query_values, $params{$key} ); + } + $query .= join( ',', @query_keys ); + + if ($course_id) { + $query .= " WHERE course_id = ?"; + push( @query_values, $course_id ); + } + + $dbh->do( $query, undef, @query_values ); + + $course_id = $course_id + || $dbh->last_insert_id( undef, undef, 'courses', 'course_id' ); + + EnableOrDisableCourseItems( + course_id => $course_id, + enabled => $params{'enabled'} + ); + + return $course_id; +} + +=head2 GetCourses + + @courses = GetCourses( [ fieldname => $value ] [, fieldname2 => $value2 ] [etc...] ); + +=cut + +sub GetCourses { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my @query_keys; + my @query_values; + + my $query = " + SELECT courses.* + FROM courses + LEFT JOIN course_reserves ON course_reserves.course_id = courses.course_id + LEFT JOIN course_items ON course_items.ci_id = course_reserves.ci_id + "; + + if ( keys %params ) { + + $query .= " WHERE "; + + foreach my $key ( keys %params ) { + push( @query_keys, " $key LIKE ? " ); + push( @query_values, $params{$key} ); + } + + $query .= join( ' AND ', @query_keys ); + } + + $query .= " GROUP BY courses.course_id "; + + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute(@query_values); + + my $courses = $sth->fetchall_arrayref( {} ); + + foreach my $c (@$courses) { + $c->{'instructors'} = GetCourseInstructors( $c->{'course_id'} ); + } + + return $courses; +} + +=head2 DelCourse + + DelCourse( $course_id ); + +=cut + +sub DelCourse { + my ($course_id) = @_; + + my $course_reserves = GetCourseReserves( course_id => $course_id ); + + foreach my $res (@$course_reserves) { + DelCourseReserve( cr_id => $res->{'cr_id'} ); + } + + my $query = " + DELETE FROM course_instructors + WHERE course_id = ? + "; + C4::Context->dbh->do( $query, undef, $course_id ); + + $query = " + DELETE FROM courses + WHERE course_id = ? + "; + C4::Context->dbh->do( $query, undef, $course_id ); +} + +=head2 EnableOrDisableCourseItems + + EnableOrDisableCourseItems( course_id => $course_id, enabled => $enabled ); + + For each item on reserve for this course, + if the course item has no active course reserves, + swap the fields for the item to make it 'normal' + again. + + enabled => 'yes' to enable course items + enabled => 'no' to disable course items + +=cut + +sub EnableOrDisableCourseItems { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $course_id = $params{'course_id'}; + my $enabled = $params{'enabled'} || 0; + + my $lookfor = ( $enabled eq 'yes' ) ? 'no' : 'yes'; + + return unless ( $course_id && $enabled ); + return unless ( $enabled eq 'yes' || $enabled eq 'no' ); + + my $course_reserves = GetCourseReserves( course_id => $course_id ); + + if ( $enabled eq 'yes' ) { + foreach my $course_reserve (@$course_reserves) { + if ( + CountCourseReservesForItem( + ci_id => $course_reserve->{'ci_id'}, + enabled => 'yes' + ) + ) + { + EnableOrDisableCourseItem( + ci_id => $course_reserve->{'ci_id'}, + enabled => 'yes', + ); + } + } + } + if ( $enabled eq 'no' ) { + foreach my $course_reserve (@$course_reserves) { + unless ( + CountCourseReservesForItem( + ci_id => $course_reserve->{'ci_id'}, + enabled => 'yes' + ) + ) + { + EnableOrDisableCourseItem( + ci_id => $course_reserve->{'ci_id'}, + enabled => 'no', + ); + } + } + } +} + +=head2 EnableOrDisableCourseItem + + EnableOrDisableCourseItem( ci_id => $ci_id, enabled => $enabled ); + + enabled => 'yes' to enable course items + enabled => 'no' to disable course items + +=cut + +sub EnableOrDisableCourseItem { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $ci_id = $params{'ci_id'}; + my $enabled = $params{'enabled'}; + + return unless ( $ci_id && $enabled ); + return unless ( $enabled eq 'yes' || $enabled eq 'no' ); + + my $course_item = GetCourseItem( ci_id => $ci_id ); + + ## We don't want to 'enable' an already enabled item, + ## or disable and already disabled item, + ## as that would cause the fields to swap + if ( $course_item->{'enabled'} ne $enabled ) { + _SwapAllFields($ci_id); + + my $query = " + UPDATE course_items + SET enabled = ? + WHERE ci_id = ? + "; + + C4::Context->dbh->do( $query, undef, $enabled, $ci_id ); + + } + +} + +=head2 GetCourseInstructors + + @$borrowers = GetCourseInstructors( $course_id ); + +=cut + +sub GetCourseInstructors { + my ($course_id) = @_; + warn "C4::CourseReserves::GetCourseInstructors( $course_id )" + if $DEBUG; + + my $query = " + SELECT * FROM borrowers + RIGHT JOIN course_instructors ON ( course_instructors.borrowernumber = borrowers.borrowernumber ) + WHERE course_instructors.course_id = ? + "; + + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute($course_id); + + return $sth->fetchall_arrayref( {} ); +} + +=head2 ModCourseInstructors + + ModCourseInstructors( mode => $mode, course_id => $course_id, [ cardnumbers => $cardnumbers ] OR [ borrowernumbers => $borrowernumbers ); + + $mode can be 'replace', 'add', or 'delete' + + $cardnumbers and $borrowernumbers are both references to arrays + + Use either cardnumbers or borrowernumber, but not both. + +=cut + +sub ModCourseInstructors { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $course_id = $params{'course_id'}; + my $mode = $params{'mode'}; + my $cardnumbers = $params{'cardnumbers'}; + my $borrowernumbers = $params{'borrowernumbers'}; + + return unless ($course_id); + return + unless ( $mode eq 'replace' + || $mode eq 'add' + || $mode eq 'delete' ); + return unless ( $cardnumbers || $borrowernumbers ); + return if ( $cardnumbers && $borrowernumbers ); + + my @cardnumbers = @$cardnumbers if ( ref($cardnumbers) eq 'ARRAY' ); + my @borrowernumbers = @$borrowernumbers + if ( ref($borrowernumbers) eq 'ARRAY' ); + + my $field = (@cardnumbers) ? 'cardnumber' : 'borrowernumber'; + my @fields = (@cardnumbers) ? @cardnumbers : @borrowernumbers; + my $placeholders = join( ',', ('?') x scalar @fields ); + + my $dbh = C4::Context->dbh; + + $dbh->do( "DELETE FROM course_instructors WHERE course_id = ?", + undef, $course_id ) + if ( $mode eq 'replace' ); + + my $query; + + if ( $mode eq 'add' || $mode eq 'replace' ) { + $query = " + INSERT INTO course_instructors ( course_id, borrowernumber ) + SELECT ?, borrowernumber + FROM borrowers + WHERE $field IN ( $placeholders ) + "; + } + else { + $query = " + DELETE FROM course_instructors + WHERE course_id = ? + AND borrowernumber IN ( + SELECT borrowernumber FROM borrowers WHERE $field IN ( $placeholders ) + ) + "; + } + + my $sth = $dbh->prepare($query); + + $sth->execute( $course_id, @fields ) if (@fields); +} + +=head2 GetCourseItem { + + $course_item = GetCourseItem( itemnumber => $itemnumber [, ci_id => $ci_id ); + +=cut + +sub GetCourseItem { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $ci_id = $params{'ci_id'}; + my $itemnumber = $params{'itemnumber'}; + + return unless ( $itemnumber || $ci_id ); + + my $field = ($itemnumber) ? 'itemnumber' : 'ci_id'; + my $value = ($itemnumber) ? $itemnumber : $ci_id; + + my $query = "SELECT * FROM course_items WHERE $field = ?"; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute($value); + + my $course_item = $sth->fetchrow_hashref(); + + if ($course_item) { + $query = "SELECT * FROM course_reserves WHERE ci_id = ?"; + $sth = $dbh->prepare($query); + $sth->execute( $course_item->{'ci_id'} ); + my $course_reserves = $sth->fetchall_arrayref( {} ); + + $course_item->{'course_reserves'} = $course_reserves + if ($course_reserves); + } + return $course_item; +} + +=head2 ModCourseItem { + + ModCourseItem( %params ); + + Creates or modifies an existing course item. + +=cut + +sub ModCourseItem { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $itemnumber = $params{'itemnumber'}; + my $itype = $params{'itype'}; + my $ccode = $params{'ccode'}; + my $holdingbranch = $params{'holdingbranch'}; + my $location = $params{'location'}; + + return unless ($itemnumber); + + my $course_item = GetCourseItem( itemnumber => $itemnumber ); + + my $ci_id; + + if ($course_item) { + $ci_id = $course_item->{'ci_id'}; + + _UpdateCourseItem( + ci_id => $ci_id, + course_item => $course_item, + %params + ); + } + else { + $ci_id = _AddCourseItem(%params); + } + + return $ci_id; + +} + +=head2 _AddCourseItem + + my $ci_id = _AddCourseItem( %params ); + +=cut + +sub _AddCourseItem { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my ( @fields, @values ); + + push( @fields, 'itemnumber = ?' ); + push( @values, $params{'itemnumber'} ); + + foreach (@FIELDS) { + if ( $params{$_} ) { + push( @fields, "$_ = ?" ); + push( @values, $params{$_} ); + } + } + + my $query = "INSERT INTO course_items SET " . join( ',', @fields ); + my $dbh = C4::Context->dbh; + $dbh->do( $query, undef, @values ); + + my $ci_id = $dbh->last_insert_id( undef, undef, 'course_items', 'ci_id' ); + + return $ci_id; +} + +=head2 _UpdateCourseItem + + _UpdateCourseItem( %params ); + +=cut + +sub _UpdateCourseItem { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $ci_id = $params{'ci_id'}; + my $course_item = $params{'course_item'}; + my $itype = $params{'itype'}; + my $ccode = $params{'ccode'}; + my $holdingbranch = $params{'holdingbranch'}; + my $location = $params{'location'}; + + return unless ( $ci_id || $course_item ); + + $course_item = GetCourseItem( ci_id => $ci_id ) + unless ($course_item); + $ci_id = $course_item->{'ci_id'} unless ($ci_id); + + ## Revert fields that had an 'original' value, but now don't + ## Update the item fields to the stored values from course_items + ## and then set those fields in course_items to NULL + my @fields_to_revert; + foreach (@FIELDS) { + if ( !$params{$_} && $course_item->{$_} ) { + push( @fields_to_revert, $_ ); + } + } + _RevertFields( + ci_id => $ci_id, + fields => \@fields_to_revert, + course_item => $course_item + ) if (@fields_to_revert); + + ## Update fields that still have an original value, but it has changed + ## This necessitates only changing the current item values, as we still + ## have the original values stored in course_items + my %mod_params; + foreach (@FIELDS) { + if ( $params{$_} + && $course_item->{$_} + && $params{$_} ne $course_item->{$_} ) + { + $mod_params{$_} = $params{$_}; + } + } + ModItem( \%mod_params, undef, $course_item->{'itemnumber'} ); + + ## Update fields that didn't have an original value, but now do + ## We must save the original value in course_items, and also + ## update the item fields to the new value + my $item = GetItem( $course_item->{'itemnumber'} ); + my %mod_params_new; + my %mod_params_old; + foreach (@FIELDS) { + if ( $params{$_} && !$course_item->{$_} ) { + $mod_params_new{$_} = $params{$_}; + $mod_params_old{$_} = $item->{$_}; + } + } + _ModStoredFields( 'ci_id' => $params{'ci_id'}, %mod_params_old ); + ModItem( \%mod_params_new, undef, $course_item->{'itemnumber'} ); + +} + +=head2 _ModStoredFields + + _ModStoredFields( %params ); + + Updates the values for the 'original' fields in course_items + for a given ci_id + +=cut + +sub _ModStoredFields { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + return unless ( $params{'ci_id'} ); + + my ( @fields_to_update, @values_to_update ); + + foreach (@FIELDS) { + if ( $params{$_} ) { + push( @fields_to_update, $_ ); + push( @values_to_update, $params{$_} ); + } + } + + my $query = + "UPDATE course_items SET " + . join( ',', map { "$_=?" } @fields_to_update ) + . " WHERE ci_id = ?"; + + C4::Context->dbh->do( $query, undef, @values_to_update, $params{'ci_id'} ) + if (@values_to_update); + +} + +=head2 _RevertFields + + _RevertFields( ci_id => $ci_id, fields => \@fields_to_revert ); + +=cut + +sub _RevertFields { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $ci_id = $params{'ci_id'}; + my $course_item = $params{'course_item'}; + my $fields = $params{'fields'}; + my @fields = @$fields; + + return unless ($ci_id); + + $course_item = GetCourseItem( ci_id => $params{'ci_id'} ) + unless ($course_item); + + my $mod_item_params; + my @fields_to_null; + foreach my $field (@fields) { + foreach (@FIELDS) { + if ( $field eq $_ && $course_item->{$_} ) { + $mod_item_params->{$_} = $course_item->{$_}; + push( @fields_to_null, $_ ); + } + } + } + ModItem( $mod_item_params, undef, $course_item->{'itemnumber'} ); + + my $query = + "UPDATE course_items SET " + . join( ',', map { "$_=NULL" } @fields_to_null ) + . " WHERE ci_id = ?"; + + C4::Context->dbh->do( $query, undef, $ci_id ) if (@fields_to_null); +} + +=head2 _SwapAllFields + + _SwapAllFields( $ci_id ); + +=cut + +sub _SwapAllFields { + my ($ci_id) = @_; + warn "C4::CourseReserves::_SwapFields( $ci_id )" if $DEBUG; + + my $course_item = GetCourseItem( ci_id => $ci_id ); + my $item = GetItem( $course_item->{'itemnumber'} ); + + my %course_item_fields; + my %item_fields; + foreach (@FIELDS) { + if ( $course_item->{$_} ) { + $course_item_fields{$_} = $course_item->{$_}; + $item_fields{$_} = $item->{$_}; + } + } + + ModItem( \%course_item_fields, undef, $course_item->{'itemnumber'} ); + _ModStoredFields( %item_fields, ci_id => $ci_id ); +} + +=head2 GetCourseItems { + + $course_items = GetCourseItems( + [course_id => $course_id] + [, itemnumber => $itemnumber ] + ); + +=cut + +sub GetCourseItems { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $course_id = $params{'course_id'}; + my $itemnumber = $params{'itemnumber'}; + + return unless ($course_id); + + my @query_keys; + my @query_values; + + my $query = "SELECT * FROM course_items"; + + if ( keys %params ) { + + $query .= " WHERE "; + + foreach my $key ( keys %params ) { + push( @query_keys, " $key LIKE ? " ); + push( @query_values, $params{$key} ); + } + + $query .= join( ' AND ', @query_keys ); + } + + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute(@query_values); + + return $sth->fetchall_arrayref( {} ); +} + +=head2 DelCourseItem { + + DelCourseItem( ci_id => $cr_id ); + +=cut + +sub DelCourseItem { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $ci_id = $params{'ci_id'}; + + return unless ($ci_id); + + _RevertFields( ci_id => $ci_id, fields => \@FIELDS ); + + my $query = " + DELETE FROM course_items + WHERE ci_id = ? + "; + C4::Context->dbh->do( $query, undef, $ci_id ); +} + +=head2 GetCourseReserve { + + $course_item = GetCourseReserve( %params ); + +=cut + +sub GetCourseReserve { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $cr_id = $params{'cr_id'}; + my $course_id = $params{'course_id'}; + my $ci_id = $params{'ci_id'}; + + return unless ( $cr_id || ( $course_id && $ci_id ) ); + + my $dbh = C4::Context->dbh; + my $sth; + + if ($cr_id) { + my $query = " + SELECT * FROM course_reserves + WHERE cr_id = ? + "; + $sth = $dbh->prepare($query); + $sth->execute($cr_id); + } + else { + my $query = " + SELECT * FROM course_reserves + WHERE course_id = ? AND ci_id = ? + "; + $sth = $dbh->prepare($query); + $sth->execute( $course_id, $ci_id ); + } + + my $course_reserve = $sth->fetchrow_hashref(); + return $course_reserve; +} + +=head2 ModCourseReserve + + $id = ModCourseReserve( %params ); + +=cut + +sub ModCourseReserve { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $course_id = $params{'course_id'}; + my $ci_id = $params{'ci_id'}; + my $staff_note = $params{'staff_note'}; + my $public_note = $params{'public_note'}; + + return unless ( $course_id && $ci_id ); + + my $course_reserve = + GetCourseReserve( course_id => $course_id, ci_id => $ci_id ); + my $cr_id; + + my $dbh = C4::Context->dbh; + + if ($course_reserve) { + $cr_id = $course_reserve->{'cr_id'}; + + my $query = " + UPDATE course_reserves + SET staff_note = ?, public_note = ? + WHERE cr_id = ? + "; + $dbh->do( $query, undef, $staff_note, $public_note, $cr_id ); + } + else { + my $query = " + INSERT INTO course_reserves SET + course_id = ?, + ci_id = ?, + staff_note = ?, + public_note = ? + "; + $dbh->do( $query, undef, $course_id, $ci_id, $staff_note, + $public_note ); + $cr_id = + $dbh->last_insert_id( undef, undef, 'course_reserves', 'cr_id' ); + } + + my $course = GetCourse($course_id); + EnableOrDisableCourseItem( + ci_id => $params{'ci_id'}, + enabled => $course->{'enabled'} + ); + + return $cr_id; +} + +=head2 GetCourseReserves { + + $course_reserves = GetCourseReserves( %params ); + + Required: + course_id OR ci_id + Optional: + include_items => 1, + include_count => 1, + include_courses => 1, + +=cut + +sub GetCourseReserves { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $course_id = $params{'course_id'}; + my $ci_id = $params{'ci_id'}; + my $include_items = $params{'include_items'}; + my $include_count = $params{'include_count'}; + my $include_courses = $params{'include_courses'}; + + return unless ( $course_id || $ci_id ); + + my $field = ($course_id) ? 'course_id' : 'ci_id'; + my $value = ($course_id) ? $course_id : $ci_id; + + my $query = " + SELECT cr.*, ci.itemnumber + FROM course_reserves cr, course_items ci + WHERE cr.$field = ? + AND cr.ci_id = ci.ci_id + "; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute($value); + + my $course_reserves = $sth->fetchall_arrayref( {} ); + + if ($include_items) { + foreach my $cr (@$course_reserves) { + $cr->{'course_item'} = GetCourseItem( ci_id => $cr->{'ci_id'} ); + $cr->{'item'} = GetBiblioFromItemNumber( $cr->{'itemnumber'} ); + $cr->{'issue'} = GetOpenIssue( $cr->{'itemnumber'} ); + } + } + + if ($include_count) { + foreach my $cr (@$course_reserves) { + $cr->{'reserves_count'} = + CountCourseReservesForItem( ci_id => $cr->{'ci_id'} ); + } + } + + if ($include_courses) { + foreach my $cr (@$course_reserves) { + $cr->{'courses'} = + GetCourses( itemnumber => $cr->{'itemnumber'} ); + } + } + + return $course_reserves; +} + +=head2 DelCourseReserve { + + DelCourseReserve( cr_id => $cr_id ); + +=cut + +sub DelCourseReserve { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $cr_id = $params{'cr_id'}; + + return unless ($cr_id); + + my $dbh = C4::Context->dbh; + + my $course_reserve = GetCourseReserve( cr_id => $cr_id ); + + my $query = " + DELETE FROM course_reserves + WHERE cr_id = ? + "; + $dbh->do( $query, undef, $cr_id ); + + ## If there are no other course reserves for this item + ## delete the course_item as well + unless ( CountCourseReservesForItem( ci_id => $course_reserve->{'ci_id'} ) ) + { + DelCourseItem( ci_id => $course_reserve->{'ci_id'} ); + } + +} + +=head2 GetReservesInfo + + my $arrayref = GetItemReservesInfo( itemnumber => $itemnumber ); + + For a given item, returns an arrayref of reserves hashrefs, + with a course hashref under the key 'course' + +=cut + +sub GetItemReservesInfo { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $itemnumber = $params{'itemnumber'}; + + return unless ($itemnumber); + + my $course_item = GetCourseItem( itemnumber => $itemnumber ); + + return unless ( keys %$course_item ); + + my $course_reserves = GetCourseReserves( ci_id => $course_item->{'ci_id'} ); + + foreach my $cr (@$course_reserves) { + $cr->{'course'} = GetCourse( $cr->{'course_id'} ); + } + + return $course_reserves; +} + +=head2 CountCourseReservesForItem + + $bool = CountCourseReservesForItem( %params ); + + ci_id - course_item id + OR + itemnumber - course_item itemnumber + + enabled = 'yes' or 'no' + Optional, if not supplied, counts reserves + for both enabled and disabled courses + +=cut + +sub CountCourseReservesForItem { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $ci_id = $params{'ci_id'}; + my $itemnumber = $params{'itemnumber'}; + my $enabled = $params{'enabled'}; + + return unless ( $ci_id || $itemnumber ); + + my $course_item = + GetCourseItem( ci_id => $ci_id, itemnumber => $itemnumber ); + + my @params = ( $course_item->{'ci_id'} ); + push( @params, $enabled ) if ($enabled); + + my $query = " + SELECT COUNT(*) AS count + FROM course_reserves cr + LEFT JOIN courses c ON ( c.course_id = cr.course_id ) + WHERE ci_id = ? + "; + $query .= "AND c.enabled = ?" if ($enabled); + + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute(@params); + + my $row = $sth->fetchrow_hashref(); + + return $row->{'count'}; +} + +=head2 SearchCourses + + my $courses = SearchCourses( term => $search_term, enabled => 'yes' ); + +=cut + +sub SearchCourses { + my (%params) = @_; + warn identify_myself(%params) if $DEBUG; + + my $term = $params{'term'}; + + my $enabled = $params{'enabled'} || '%'; + + my @params; + my $query = "SELECT c.* FROM courses c"; + + $query .= " + LEFT JOIN course_instructors ci + ON ( c.course_id = ci.course_id ) + LEFT JOIN borrowers b + ON ( ci.borrowernumber = b.borrowernumber ) + LEFT JOIN authorised_values av + ON ( c.department = av.authorised_value ) + WHERE + ( av.category = 'DEPARTMENT' OR av.category = 'TERM' ) + AND + ( + department LIKE ? OR + course_number LIKE ? OR + section LIKE ? OR + course_name LIKE ? OR + term LIKE ? OR + public_note LIKE ? OR + CONCAT(surname,' ',firstname) LIKE ? OR + CONCAT(firstname,' ',surname) LIKE ? OR + lib LIKE ? OR + lib_opac LIKE ? + ) + AND + c.enabled LIKE ? + GROUP BY c.course_id + "; + + $term = "%$term%"; + @params = ($term) x 10; + + $query .= " ORDER BY department, course_number, section, term, course_name "; + + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + + $sth->execute(@params, $enabled); + + my $courses = $sth->fetchall_arrayref( {} ); + + foreach my $c (@$courses) { + $c->{'instructors'} = GetCourseInstructors( $c->{'course_id'} ); + } + + return $courses; +} + +sub whoami { ( caller(1) )[3] } +sub whowasi { ( caller(2) )[3] } + +sub stringify_params { + my (%params) = @_; + + my $string = "\n"; + + foreach my $key ( keys %params ) { + $string .= " $key => " . $params{$key} . "\n"; + } + + return "( $string )"; +} + +sub identify_myself { + my (%params) = @_; + + return whowasi() . stringify_params(%params); +} + +1; + +=head1 AUTHOR + +Kyle M Hall + +=cut diff --git a/C4/Koha.pm b/C4/Koha.pm index 4c01309..42b5438 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -204,10 +204,15 @@ sub GetSupportList{ } =head2 GetItemTypes - $itemtypes = &GetItemTypes(); + $itemtypes = &GetItemTypes( style => $style ); Returns information about existing itemtypes. +Params: + style: either 'array' or 'hash', defaults to 'hash'. + 'array' returns an arrayref, + 'hash' return a hashref with the itemtype value as the key + build a HTML select with the following code : =head3 in PERL SCRIPT @@ -240,6 +245,8 @@ build a HTML select with the following code : =cut sub GetItemTypes { + my ( %params ) = @_; + my $style = defined( $params{'style'} ) ? $params{'style'} : 'hash'; # returns a reference to a hash of references to itemtypes... my %itemtypes; @@ -250,10 +257,15 @@ sub GetItemTypes { |; my $sth = $dbh->prepare($query); $sth->execute; - while ( my $IT = $sth->fetchrow_hashref ) { - $itemtypes{ $IT->{'itemtype'} } = $IT; + + if ( $style eq 'hash' ) { + while ( my $IT = $sth->fetchrow_hashref ) { + $itemtypes{ $IT->{'itemtype'} } = $IT; + } + return ( \%itemtypes ); + } else { + return $sth->fetchall_arrayref({}); } - return ( \%itemtypes ); } sub get_itemtypeinfos_of { @@ -1106,7 +1118,7 @@ sub GetAuthorisedValueCategories { =head2 GetAuthorisedValueByCode -$authhorised_value = GetAuthorisedValueByCode( $category, $authvalcode ); +$authorised_value = GetAuthorisedValueByCode( $category, $authvalcode, $opac ); Return the lib attribute from authorised_values from the row identified by the passed category and code diff --git a/Koha/Template/Plugin/AuthorisedValues.pm b/Koha/Template/Plugin/AuthorisedValues.pm new file mode 100644 index 0000000..9df3f2e --- /dev/null +++ b/Koha/Template/Plugin/AuthorisedValues.pm @@ -0,0 +1,34 @@ +package Koha::Template::Plugin::AuthorisedValues; + +# Copyright ByWater Solutions 2012 + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use Template::Plugin; +use base qw( Template::Plugin ); + +use Encode qw{encode decode}; + +use C4::Koha; + +sub GetByCode { + my ( $self, $category, $code, $opac ) = @_; + return encode('UTF-8', GetAuthorisedValueByCode( $category, $code, $opac ) ); +} + +1; diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm new file mode 100644 index 0000000..ad768a5 --- /dev/null +++ b/Koha/Template/Plugin/Branches.pm @@ -0,0 +1,37 @@ +package Koha::Template::Plugin::Branches; + +# Copyright ByWater Solutions 2012 + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use Template::Plugin; +use base qw( Template::Plugin ); + +use C4::Koha; + +sub GetName { + my ( $self, $branchcode ) = @_; + + my $query = "SELECT branchname FROM branches WHERE branchcode = ?"; + my $sth = C4::Context->dbh->prepare($query); + $sth->execute($branchcode); + my $b = $sth->fetchrow_hashref(); + return $b->{'branchname'}; +} + +1; diff --git a/Koha/Template/Plugin/ItemTypes.pm b/Koha/Template/Plugin/ItemTypes.pm new file mode 100644 index 0000000..60ca979 --- /dev/null +++ b/Koha/Template/Plugin/ItemTypes.pm @@ -0,0 +1,38 @@ +package Koha::Template::Plugin::ItemTypes; + +# Copyright ByWater Solutions 2012 + +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use Template::Plugin; +use base qw( Template::Plugin ); + +use C4::Koha; + +sub GetDescription { + my ( $self, $itemtype ) = @_; + + my $query = "SELECT description FROM itemtypes WHERE itemtype = ?"; + my $sth = C4::Context->dbh->prepare($query); + $sth->execute($itemtype); + my $d = $sth->fetchrow_hashref(); + return $d->{'description'}; + +} + +1; diff --git a/Makefile.PL b/Makefile.PL index 02e9689..642b535 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -261,6 +261,7 @@ my $target_map = { './changelanguage.pl' => 'INTRANET_CGI_DIR', './check_sysprefs.pl' => 'NONE', './circ' => 'INTRANET_CGI_DIR', + './course_reserves' => 'INTRANET_CGI_DIR', './offline_circ' => 'INTRANET_CGI_DIR', './edithelp.pl' => 'INTRANET_CGI_DIR', './etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 }, diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index c00bb64..d344438 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -247,7 +247,7 @@ sub default_form { } # push koha system categories - foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP)) { + foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP DEPARTMENT TERM)) { push @category_list, $_ unless $categories{$_}; } diff --git a/catalogue/detail.pl b/catalogue/detail.pl index ec6f6eb..cbf2ecb 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -41,6 +41,7 @@ use C4::XSLT; use C4::Images; use Koha::DateUtils; use C4::HTML5Media; +use C4::CourseReserves; # use Smart::Comments; @@ -269,6 +270,10 @@ foreach my $item (@items) { $materials_flag = 1; } + if ( C4::Context->preference('UseCourseReserves') ) { + $item->{'course_reserves'} = GetItemReservesInfo( itemnumber => $item->{'itemnumber'} ); + } + if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET" and C4::Context->preference('SeparateHoldings')) { if ($itembranchcode and $itembranchcode eq $currentbranch) { diff --git a/course_reserves/add_items.pl b/course_reserves/add_items.pl new file mode 100755 index 0000000..bbf67d5 --- /dev/null +++ b/course_reserves/add_items.pl @@ -0,0 +1,97 @@ +#!/usr/bin/perl + +# +# Copyright 2012 Bywater Solutions +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; + +use C4::Auth; +use C4::Output; +use C4::Koha; +use C4::Biblio; +use C4::Branch; + +use C4::CourseReserves; + +my $cgi = new CGI; + +my $action = $cgi->param('action') || ''; +my $course_id = $cgi->param('course_id') || ''; +my $barcode = $cgi->param('barcode') || ''; + +die('No course_id provided') unless ($course_id); + +my $item = GetBiblioFromItemNumber( undef, $barcode ); + +my $step = ( $action eq 'lookup' && $item ) ? '2' : '1'; + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "course_reserves/add_items-step$step.tmpl", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => { coursereserves => 'add_reserves' }, + } +); +$template->param( ERROR_BARCODE_NOT_FOUND => $barcode ) + unless ( $barcode && $item && $action eq 'lookup' ); + +$template->param( course => GetCourse($course_id) ); + +if ( $action eq 'lookup' ) { + my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} ); + my $course_reserve = ($course_item) + ? GetCourseReserve( + course_id => $course_id, + ci_id => $course_item->{'ci_id'} + ) + : undef; + + $template->param( + item => $item, + course_item => $course_item, + course_reserve => $course_reserve, + + ccodes => GetAuthorisedValues('CCODE'), + locations => GetAuthorisedValues('LOC'), + itypes => GetItemTypes( style => 'array' ), + branches => GetBranchesLoop(), + ); + +} +elsif ( $action eq 'add' ) { + my $ci_id = ModCourseItem( + itemnumber => $cgi->param('itemnumber'), + itype => $cgi->param('itype'), + ccode => $cgi->param('ccode'), + holdingbranch => $cgi->param('holdingbranch'), + location => $cgi->param('location'), + ); + + my $cr_id = ModCourseReserve( + course_id => $course_id, + ci_id => $ci_id, + staff_note => $cgi->param('staff_note'), + public_note => $cgi->param('public_note'), + ); +} + +output_html_with_http_headers $cgi, $cookie, $template->output; diff --git a/course_reserves/course-details.pl b/course_reserves/course-details.pl new file mode 100755 index 0000000..a0b03e9 --- /dev/null +++ b/course_reserves/course-details.pl @@ -0,0 +1,67 @@ +#!/usr/bin/perl + +# +# Copyright 2012 Bywater Solutions +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; + +use C4::Auth; +use C4::Output; +use C4::Koha; + +use C4::CourseReserves; + +my $cgi = new CGI; + +my $action = $cgi->param('action') || ''; +my $course_id = $cgi->param('course_id'); + +my $flagsrequired; +$flagsrequired->{coursereserves} = 'delete_reserves' if ( $action eq 'del_reserve' ); + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "course_reserves/course-details.tmpl", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => $flagsrequired, + } +); + +die("No course_id given") unless ($course_id); + +if ( $action eq 'del_reserve' ) { + DelCourseReserve( cr_id => $cgi->param('cr_id') ); +} + +my $course = GetCourse($course_id); +my $course_reserves = GetCourseReserves( + course_id => $course_id, + include_items => 1, + include_courses => 1 +); + +$template->param( + course => $course, + course_reserves => $course_reserves, +); + +output_html_with_http_headers $cgi, $cookie, $template->output; diff --git a/course_reserves/course-reserves.pl b/course_reserves/course-reserves.pl new file mode 100755 index 0000000..ebffed4 --- /dev/null +++ b/course_reserves/course-reserves.pl @@ -0,0 +1,54 @@ +#!/usr/bin/perl + +# +# Copyright 2012 Bywater Solutions +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; + +use C4::Auth; +use C4::Output; + +use C4::CourseReserves; + +my $cgi = new CGI; + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "course_reserves/course-reserves.tmpl", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => {}, + } +); + +my $search_on = $cgi->param('search_on'); +my %params; +if ($search_on) { + $params{'course_name'} = "%$search_on%"; +} + +my $courses = GetCourses(%params); +if ( $search_on && @$courses == 1 ) { + print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=" . $courses->[0]->{'course_id'}); +} else { + $template->param( courses => $courses ); + output_html_with_http_headers $cgi, $cookie, $template->output; +} diff --git a/course_reserves/course.pl b/course_reserves/course.pl new file mode 100755 index 0000000..e2af77f --- /dev/null +++ b/course_reserves/course.pl @@ -0,0 +1,55 @@ +#!/usr/bin/perl + +# +# Copyright 2012 Bywater Solutions +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; + +use C4::Auth; +use C4::Output; +use C4::Koha; + +use C4::CourseReserves; + +my $cgi = new CGI; + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "course_reserves/course.tmpl", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => { coursereserves => 'manage_courses' }, + } +); + +my $course_id = $cgi->param('course_id'); + +if ($course_id) { + my $course = GetCourse($course_id); + $template->param(%$course); +} + +$template->param( + departments => GetAuthorisedValues('DEPARTMENT'), + terms => GetAuthorisedValues('TERM'), +); + +output_html_with_http_headers $cgi, $cookie, $template->output; diff --git a/course_reserves/mod_course.pl b/course_reserves/mod_course.pl new file mode 100755 index 0000000..0df85f3 --- /dev/null +++ b/course_reserves/mod_course.pl @@ -0,0 +1,72 @@ +#!/usr/bin/perl + +# Copyright 2012 ByWater Solutions +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; + +use C4::Output; +use C4::Reserves; +use C4::Auth; + +use C4::CourseReserves; + +my $cgi = new CGI; +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "about.tmpl", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => { coursereserves => 'manage_courses' }, + } +); + +my $action = $cgi->param('action'); + +if ( $action eq 'del' ) { + DelCourse( $cgi->param('course_id') ); + print $cgi->redirect("/cgi-bin/koha/course_reserves/course-reserves.pl"); +} +else { + my %params; + + $params{'course_id'} = $cgi->param('course_id') + if ( $cgi->param('course_id') ); + $params{'department'} = $cgi->param('department'); + $params{'course_number'} = $cgi->param('course_number'); + $params{'section'} = $cgi->param('section'); + $params{'course_name'} = $cgi->param('course_name'); + $params{'term'} = $cgi->param('term'); + $params{'staff_note'} = $cgi->param('staff_note'); + $params{'public_note'} = $cgi->param('public_note'); + $params{'students_count'} = $cgi->param('students_count'); + $params{'enabled'} = ( $cgi->param('enabled') eq 'on' ) ? 'yes' : 'no'; + + my $course_id = ModCourse(%params); + + my @instructors = $cgi->param('instructors'); + ModCourseInstructors( + mode => 'replace', + cardnumbers => \@instructors, + course_id => $course_id + ); + print $cgi->redirect( + "/cgi-bin/koha/course_reserves/course-details.pl?course_id=$course_id"); +} diff --git a/installer/data/mysql/de-DE/mandatory/userflags.sql b/installer/data/mysql/de-DE/mandatory/userflags.sql index aeccf76..ec2312f 100644 --- a/installer/data/mysql/de-DE/mandatory/userflags.sql +++ b/installer/data/mysql/de-DE/mandatory/userflags.sql @@ -15,3 +15,4 @@ INSERT INTO `userflags` VALUES(14,'editauthorities','Normdaten ändern',0); INSERT INTO `userflags` VALUES(15,'serials','Zugang auf Abonnementverwaltung/Zeitschriftenmodul',0); INSERT INTO `userflags` VALUES(16,'reports','Zugang auf Reportmodul',0); INSERT INTO `userflags` VALUES(17,'staffaccess','Berechtigungen für Bibliotheksmitarbeiter vergeben',0); +INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql index f203a8d..6e7eeeb 100644 --- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql +++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql @@ -52,5 +52,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Abonnements verlängern'), (15, 'routing', 'Umlauflisten verwalten'), (16, 'execute_reports', 'SQL-Reports ausführen'), - (16, 'create_reports', 'SQL-Reports erstellen') + (16, 'create_reports', 'SQL-Reports erstellen'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/en/mandatory/userflags.sql b/installer/data/mysql/en/mandatory/userflags.sql index 926e53b..febd8c3 100644 --- a/installer/data/mysql/en/mandatory/userflags.sql +++ b/installer/data/mysql/en/mandatory/userflags.sql @@ -15,3 +15,4 @@ INSERT INTO `userflags` VALUES(14,'editauthorities','Edit Authorities',0); INSERT INTO `userflags` VALUES(15,'serials','Manage serial subscriptions',0); INSERT INTO `userflags` VALUES(16,'reports','Allow access to the reports module',0); INSERT INTO `userflags` VALUES(17,'staffaccess','Allow staff members to modify permissions for other staff members',0); +INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql index 8577ef2..b39ae09 100644 --- a/installer/data/mysql/en/mandatory/userpermissions.sql +++ b/installer/data/mysql/en/mandatory/userpermissions.sql @@ -52,5 +52,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), (16, 'execute_reports', 'Execute SQL reports'), - (16, 'create_reports', 'Create SQL Reports') + (16, 'create_reports', 'Create SQL Reports'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/es-ES/mandatory/userflags.sql b/installer/data/mysql/es-ES/mandatory/userflags.sql index e9d9b2e..cc683fd 100644 --- a/installer/data/mysql/es-ES/mandatory/userflags.sql +++ b/installer/data/mysql/es-ES/mandatory/userflags.sql @@ -15,3 +15,4 @@ INSERT INTO `userflags` VALUES(14,'editauthorities','Allow to edit authorities', INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0); INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0); INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0); +INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); diff --git a/installer/data/mysql/es-ES/mandatory/userpermissions.sql b/installer/data/mysql/es-ES/mandatory/userpermissions.sql index 8577ef2..b39ae09 100644 --- a/installer/data/mysql/es-ES/mandatory/userpermissions.sql +++ b/installer/data/mysql/es-ES/mandatory/userpermissions.sql @@ -52,5 +52,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), (16, 'execute_reports', 'Execute SQL reports'), - (16, 'create_reports', 'Create SQL Reports') + (16, 'create_reports', 'Create SQL Reports'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql index 68fea6e..46fe0b0 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql @@ -16,3 +16,4 @@ INSERT INTO `userflags` VALUES(13,'tools','Outils (export, import, impression de INSERT INTO `userflags` VALUES(14,'editauthorities','Gestion des autorités',0); INSERT INTO `userflags` VALUES(15,'serials','Gestion du module périodique',0); INSERT INTO `userflags` VALUES(16,'reports','Accès aux statistiques',0); +INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql index 3c57a81..ca5748a 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql @@ -52,6 +52,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Renouveler les abonnements'), (15, 'routing', 'Mettre en circulation'), (16, 'execute_reports', 'Lancer les rapports SQL'), - (16, 'create_reports', 'Créer les rapports SQL Reports') - + (16, 'create_reports', 'Créer les rapports SQL Reports'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/it-IT/necessari/userflags.sql b/installer/data/mysql/it-IT/necessari/userflags.sql index eaabb50..4cfc4ba 100644 --- a/installer/data/mysql/it-IT/necessari/userflags.sql +++ b/installer/data/mysql/it-IT/necessari/userflags.sql @@ -17,5 +17,6 @@ INSERT INTO `userflags` VALUES(14,'editauthorities','autorizza la modifica delle INSERT INTO `userflags` VALUES(15,'serials','autorizza la gestione degli abbonamenti ai periodici',0); INSERT INTO `userflags` VALUES(16,'reports','autorizza accesso al modulo dei reports',0); INSERT INTO `userflags` VALUES(17,'staffaccess','modifica la login o i permessi degli staff users',0); +INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql index 31e6e18..f9b2d70 100644 --- a/installer/data/mysql/it-IT/necessari/userpermissions.sql +++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql @@ -54,6 +54,9 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Rinnova un abbonamento'), (15, 'routing', 'Crea/Manipola liste di distribuzione dei fascicoli ( routing list)'), (16, 'execute_reports', 'Esegui reports SQL'), - (16, 'create_reports', 'Crea reports SQL') + (16, 'create_reports', 'Crea reports SQL'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; SET FOREIGN_KEY_CHECKS=1; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 4872a1f..d5adc52 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -466,6 +466,108 @@ CREATE TABLE collections_tracking ( ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8; -- +-- Table structure for table `courses` +-- + +-- The courses table stores the courses created for the +-- course reserves feature. + +DROP TABLE IF EXISTS courses; +CREATE TABLE `courses` ( + `course_id` int(11) NOT NULL AUTO_INCREMENT, + `department` varchar(20) DEFAULT NULL, -- Stores the authorised value DEPT + `course_number` varchar(255) DEFAULT NULL, -- An arbitrary field meant to store the "course number" assigned to a course + `section` varchar(255) DEFAULT NULL, -- Also arbitrary, but for the 'section' of a course. + `course_name` varchar(255) DEFAULT NULL, + `term` varchar(20) DEFAULT NULL, -- Stores the authorised value TERM + `staff_note` mediumtext, + `public_note` mediumtext, + `students_count` varchar(20) DEFAULT NULL, -- Meant to be just an estimate of how many students will be taking this course/section + `enabled` enum('yes','no') NOT NULL DEFAULT 'yes', -- Determines whether the course is active + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`course_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Table structure for table `course_instructors` +-- + +-- The course instructors table links Koha borrowers to the +-- courses they are teaching. Many instructors can teach many +-- courses. course_instructors is just a many-to-many join table. + +DROP TABLE IF EXISTS course_instructors; +CREATE TABLE `course_instructors` ( + `course_id` int(11) NOT NULL, + `borrowernumber` int(11) NOT NULL, + PRIMARY KEY (`course_id`,`borrowernumber`), + KEY `borrowernumber` (`borrowernumber`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Constraints for table `course_instructors` +-- +ALTER TABLE `course_instructors` + ADD CONSTRAINT `course_instructors_ibfk_2` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`), + ADD CONSTRAINT `course_instructors_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- +-- Table structure for table `course_items` +-- + +-- If an item is placed on course reserve for one or more courses +-- it will have an entry in this table. No matter how many courses an item +-- is part of, it will only have one row in this table. + +DROP TABLE IF EXISTS course_items; +CREATE TABLE `course_items` ( + `ci_id` int(11) NOT NULL AUTO_INCREMENT, + `itemnumber` int(11) NOT NULL, -- items.itemnumber for the item on reserve + `itype` varchar(10) DEFAULT NULL, -- an optional new itemtype for the item to have while on reserve + `ccode` varchar(10) DEFAULT NULL, -- an optional new category code for the item to have while on reserve + `holdingbranch` varchar(10) DEFAULT NULL, -- an optional new holding branch for the item to have while on reserve + `location` varchar(80) DEFAULT NULL, -- an optional new shelving location for the item to have while on reseve + `enabled` enum('yes','no') NOT NULL DEFAULT 'no', -- If at least one enabled course has this item on reseve, this field will be 'yes', otherwise it will be 'no' + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`ci_id`), + UNIQUE KEY `itemnumber` (`itemnumber`), + KEY `holdingbranch` (`holdingbranch`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Constraints for table `course_items` +-- +ALTER TABLE `course_items` + ADD CONSTRAINT `course_items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, + ADD CONSTRAINT `course_items_ibfk_1` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE; + +-- +-- Table structure for table `course_reserves` +-- + +-- This table connects an item placed on course reserve to a course it is on reserve for. +-- There will be a row in this table for each course an item is on reserve for. + +DROP TABLE IF EXISTS course_reserves; +CREATE TABLE `course_reserves` ( + `cr_id` int(11) NOT NULL AUTO_INCREMENT, + `course_id` int(11) NOT NULL, -- Foreign key to the courses table + `ci_id` int(11) NOT NULL, -- Foreign key to the course_items table + `staff_note` mediumtext, -- Staff only note + `public_note` mediumtext, -- Public, OPAC visible note + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`cr_id`), + UNIQUE KEY `pseudo_key` (`course_id`,`ci_id`), + KEY `course_id` (`course_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Constraints for table `course_reserves` +-- +ALTER TABLE `course_reserves` + ADD CONSTRAINT `course_reserves_ibfk_1` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`); + +-- -- Table structure for table `borrower_branch_circ_rules` -- diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql index 2e73c7f4..afd4652 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql @@ -36,3 +36,4 @@ INSERT INTO `userflags` VALUES(14,'editauthorities','Tilgang til å endre autori INSERT INTO `userflags` VALUES(15,'serials','Tilgang til å endre abonnementer',0); INSERT INTO `userflags` VALUES(16,'reports','Tilgang til rapportmodulen',0); INSERT INTO `userflags` VALUES(17,'staffaccess','Endre innlogging og rettigheter for bibliotekansatte',0); +INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql index 7977865..1753f93 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql @@ -72,5 +72,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Fornye abonnementer'), (15, 'routing', 'Sirkulasjon'), (16, 'execute_reports', 'Kjøre SQL-rapporter'), - (16, 'create_reports', 'Opprette SQL-rapporter') + (16, 'create_reports', 'Opprette SQL-rapporter'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/pl-PL/mandatory/userflags.sql b/installer/data/mysql/pl-PL/mandatory/userflags.sql index e9d9b2e..cc683fd 100644 --- a/installer/data/mysql/pl-PL/mandatory/userflags.sql +++ b/installer/data/mysql/pl-PL/mandatory/userflags.sql @@ -15,3 +15,4 @@ INSERT INTO `userflags` VALUES(14,'editauthorities','Allow to edit authorities', INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0); INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0); INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0); +INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0); diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql index 02b2551..174ba76 100644 --- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql +++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql @@ -53,5 +53,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), (16, 'execute_reports', 'Execute SQL reports'), - (16, 'create_reports', 'Create SQL Reports') + (16, 'create_reports', 'Create SQL Reports'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql index 868c3c0..4e2a0a3 100644 --- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql +++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql @@ -17,7 +17,8 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (14,'editauthorities', 'Разрешение на изменение авторитетных источников',0), (15,'serials', 'Разрешение на управление подпиской периодических изданий',0), (16,'reports', 'Разрешение на доступ к модулю отчетов',0), - (17,'staffaccess', 'Смена имени(логина)/привилегий для работников библиотеки',0) + (17,'staffaccess', 'Смена имени(логина)/привилегий для работников библиотеки',0), + (18,'coursereserves', 'Course Reserves',0); ; TRUNCATE permissions; @@ -76,6 +77,9 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), (16, 'execute_reports', 'Execute SQL reports'), - (16, 'create_reports', 'Create SQL Reports') + (16, 'create_reports', 'Create SQL Reports'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 0189c6b..3399964 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -418,3 +418,4 @@ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) V INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UseQueryParser', '0', 'If enabled, try to use QueryParser for queries.', NULL, 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('FinesIncludeGracePeriod','1','If enabled, fines calculations will include the grace period.',NULL,'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UNIMARCAuthorsFacetsSeparator',', ', 'UNIMARC authors facets separator', NULL, 'short'); +INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo'); diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql index 8d0126b..5562f32 100644 --- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql +++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql @@ -17,7 +17,8 @@ INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (14,'editauthorities', 'Дозвіл на редагування авторитетних джерел',0), (15,'serials', 'Дозвіл на керування підпискою періодичних видань',0), (16,'reports', 'Дозвіл на доступ до модуля звітів',0), - (17,'staffaccess', 'Зміна імені(логіну)/привілеїв для працівників бібліотеки',0) + (17,'staffaccess', 'Зміна імені(логіну)/привілеїв для працівників бібліотеки',0), + (18,'coursereserves', 'Course Reserves',0); ; TRUNCATE permissions; @@ -76,6 +77,9 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Renew a subscription'), (15, 'routing', 'Routing'), (16, 'execute_reports', 'Execute SQL reports'), - (16, 'create_reports', 'Create SQL Reports') + (16, 'create_reports', 'Create SQL Reports'), + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') ; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index dbb3faa..8bf6086 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5797,7 +5797,6 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } - $DBversion = "3.09.00.047"; if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { # to preserve default behaviour as best as possible, set this new preference differently depending on whether IndependantBranches is set or not @@ -5828,8 +5827,6 @@ if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } - - $DBversion = "3.09.00.050"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("ALTER TABLE authorised_values MODIFY category varchar(16) NOT NULL DEFAULT '';"); @@ -6557,6 +6554,96 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.11.00.XXX"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('UseCourseReserves', '0', NULL, 'Enable the course reserves feature.', 'YesNo')"); + $dbh->do("INSERT INTO userflags (bit,flag,flagdesc,defaulton) VALUES ('18','coursereserves','Course Reserves','0')"); + $dbh->do(" +CREATE TABLE `courses` ( + `course_id` int(11) NOT NULL AUTO_INCREMENT, + `department` varchar(20) DEFAULT NULL, + `course_number` varchar(255) DEFAULT NULL, + `section` varchar(255) DEFAULT NULL, + `course_name` varchar(255) DEFAULT NULL, + `term` varchar(20) DEFAULT NULL, + `staff_note` mediumtext, + `public_note` mediumtext, + `students_count` varchar(20) DEFAULT NULL, + `enabled` enum('yes','no') NOT NULL DEFAULT 'yes', + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`course_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + "); + + $dbh->do(" +CREATE TABLE `course_instructors` ( + `course_id` int(11) NOT NULL, + `borrowernumber` int(11) NOT NULL, + PRIMARY KEY (`course_id`,`borrowernumber`), + KEY `borrowernumber` (`borrowernumber`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + "); + + $dbh->do(" +ALTER TABLE `course_instructors` + ADD CONSTRAINT `course_instructors_ibfk_2` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`), + ADD CONSTRAINT `course_instructors_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE; + "); + + $dbh->do(" +CREATE TABLE `course_items` ( + `ci_id` int(11) NOT NULL AUTO_INCREMENT, + `itemnumber` int(11) NOT NULL, + `itype` varchar(10) DEFAULT NULL, + `ccode` varchar(10) DEFAULT NULL, + `holdingbranch` varchar(10) DEFAULT NULL, + `location` varchar(80) DEFAULT NULL, + `enabled` enum('yes','no') NOT NULL DEFAULT 'no', + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`ci_id`), + UNIQUE KEY `itemnumber` (`itemnumber`), + KEY `holdingbranch` (`holdingbranch`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + "); + +$dbh->do(" +ALTER TABLE `course_items` + ADD CONSTRAINT `course_items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE, + ADD CONSTRAINT `course_items_ibfk_1` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE; +"); + +$dbh->do(" +CREATE TABLE `course_reserves` ( + `cr_id` int(11) NOT NULL AUTO_INCREMENT, + `course_id` int(11) NOT NULL, + `ci_id` int(11) NOT NULL, + `staff_note` mediumtext, + `public_note` mediumtext, + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`cr_id`), + UNIQUE KEY `pseudo_key` (`course_id`,`ci_id`), + KEY `course_id` (`course_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +"); + + $dbh->do(" +ALTER TABLE `course_reserves` + ADD CONSTRAINT `course_reserves_ibfk_1` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`); + "); + + $dbh->do(" +INSERT INTO permissions (module_bit, code, description) VALUES + (18, 'manage_courses', 'Add, edit and delete courses'), + (18, 'add_reserves', 'Add course reserves'), + (18, 'delete_reserves', 'Remove course reserves') +; + "); + + + print "Upgrade to $DBversion done (Add Course Reserves ( system preference UseCourseReserves ))\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 91d0431..8e7f15a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -744,7 +744,7 @@ fieldset.rows .inputnote { visibility:visible; /* you propably don't need to change this one */ display:block; } -#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child { +#new_course a, #newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child { padding-left : 34px; background-image: url("../../img/toolbar-new.gif"); background-position : center left; @@ -2550,4 +2550,4 @@ button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit .btn-group label, .btn-group select { font-size: 13px; -} \ No newline at end of file +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index f4ab3f2..dd48044 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -24,6 +24,9 @@ [% IF ( CAN_user_serials ) %]
  • Serials
    • [% END %] + [% IF ( CAN_user_coursereserves ) %] +
  • Course Reserves
    • + [% END %] [% IF ( CAN_user_reports ) %]
  • Reports
    • [% END %] @@ -93,4 +96,4 @@ [% IF ( intranetbookbag ) %]
    Your cart is empty.
    [% END %] - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js index f21b122..53fc249 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js @@ -5,14 +5,16 @@ function _(s) { return s; } // dummy function for gettext $(document).ready(function() { $('#header_search').tabs().bind('tabsshow', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); }); - $(".close").click(function(){ window.close(); }); + + $(".close").click(function(){ window.close(); }); + if($("#header_search #checkin_search").length > 0){ $(document).bind('keydown','Alt+r',function (){ $("#header_search").tabs("select","#checkin_search"); $("#ret_barcode").focus(); }); } else { $(document).bind('keydown','Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); } if($("#header_search #circ_search").length > 0){ $(document).bind('keydown','Alt+u',function (){ $("#header_search").tabs("select","#circ_search"); $("#findborrower").focus(); }); } else { $(document).bind('keydown','Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); } if($("#header_search #catalog_search").length > 0){ $(document).bind('keydown','Alt+q',function (){ $("#header_search").tabs("select","#catalog_search"); $("#search-form").focus(); }); } else { $(document).bind('keydown','Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); } + $(".focus").focus(); }); - // http://jennifermadden.com/javascript/stringEnterKeyDetector.html function checkEnter(e){ //e is event object passed from function invocation var characterCode; // literal character code will be stored in this variable diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index f88d964..243b8e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -543,3 +543,10 @@ Circulation: - and this password - pref: AutoSelfCheckPass - . + Course Reserves: + - + - pref: UseCourseReserves + choices: + yes: Use + no: "Don't use" + - course reserves diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 8f40e31..b136052 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1,3 +1,18 @@ +[% USE AuthorisedValues %] + +[% ShowCourseReserves = 0 %] +[% IF UseCourseReserves %] + [% FOREACH item IN itemloop %] + [% IF item.course_reserves %] + [% FOREACH r IN item.course_reserves %] + [% IF r.course.enabled == 'yes' %] + [% ShowCourseReserves = 1 %] + [% END %] + [% END %] + [% END %] + [% END %] +[% END %] + [% INCLUDE 'doc-head-open.inc' %] [% INCLUDE 'greybox.inc' %] Koha › Catalog › @@ -370,6 +385,7 @@ function verify_images() { [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %] [% IF ( hostrecords ) %]<th>Host records</th>[% END %] [% IF ( analyze ) %]<th>Used in</th><th></th>[% END %] + [% IF ( ShowCourseReserves ) %]<th>Course Reserves</th>[% END %] </tr> </thead> <tbody> @@ -522,6 +538,24 @@ function verify_images() { <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber %]&hostitemnumber=[% item.itemnumber %]">Create analytics</a></td> [% END %] + [% IF ShowCourseReserves %] + <td> + [% IF item.course_reserves %] + [% FOREACH r IN item.course_reserves %] + [% IF r.course.enabled == 'yes' %] + <p> + <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id %]"> + [% r.course.course_name %] + <!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]--> + [% IF r.course.section %] [% r.course.section %] [% END %] + [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %] + </a> + </p> + [% END %] + [% END %] + [% END %] + </td> + [% END %] </tr> [% END %] </tbody> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index f01c682..d7e3536 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -10,7 +10,7 @@ $(document).ready(function(){ window.close(); [% END %] [% END %] - $("fieldset.rows input").keydown(function(e){ return checkEnter(e); }); + $("fieldset.rows input").addClass("noEnterSubmit"); /* Inline edit/delete links */ var biblionumber = $("input[name='biblionumber']").attr("value"); $("td").click(function(event){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt new file mode 100644 index 0000000..ab1b6ce --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt @@ -0,0 +1,63 @@ +[% INCLUDE 'doc-head-open.inc' %] +<title>Koha › Course reserves › Add items +[% INCLUDE 'doc-head-close.inc' %] + + + + + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'cat-search.inc' %] + + + +
    +
    +
    +
    +
    +
    + [% IF ERROR_BARCODE_NOT_FOUND %] +
    No item found for barcode [% ERROR_BARCODE_NOT_FOUND %]
    + [% END %] + +
    + + + +
    + Add items: scan barcode + +

    + +

  • + + +
    • + +
    + +
    + + + Cancel +
    +
    +
    +
    +
    +
    +
    +
    + + +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt new file mode 100644 index 0000000..2326e3f --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -0,0 +1,133 @@ +[% INCLUDE 'doc-head-open.inc' %] +Koha › Course reserves › Add items +[% INCLUDE 'doc-head-close.inc' %] + + + + + + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'cat-search.inc' %] + + + +
    +
    +
    +
    +
    +
    + [% IF course_reserve %]
    This course already has this item on reserve.
    [% END %] + [% IF course_item %]
    Number of courses reserving this item: [% course_item.course_reserves.size %]
    [% END %] + +
    + + + +
    + Add [% item.title %] to [% course.course_name %] +
      +
    1. + + [% item.barcode %] + +
      2. + + [% IF item_level_itypes %] +
    2. + + +
      3. + [% END %] + +
    3. + + +
      4. + +
    4. + + +
      5. + +
    5. + + +
      6. + +
    6. + + +
      7. + +
    7. + + +
      8. + +
    +
    + +
    + + + Cancel +
    + +
    +
    +
    +
    +
    +
    + + +[% INCLUDE 'intranet-bottom.inc' %] 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 new file mode 100644 index 0000000..3c91065 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -0,0 +1,185 @@ +[% USE AuthorisedValues %] +[% USE ItemTypes %] +[% USE Branches %] +[% INCLUDE 'doc-head-open.inc' %] +Koha › Course reserves › New course +[% INCLUDE 'doc-head-close.inc' %] + + + + + + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'cat-search.inc' %] + + + +
    +
    +
    +
    + +
      + [% IF CAN_user_coursereserves_add_reserves %]
    • Add reserves
      • [% END %] + [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Edit course
      • [% END %] + [% IF ( CAN_user_coursereserves_manage_courses ) %]
    • Delete course
      • [% END %] +
    +
    + + + + + + + + + + + + +
    Course name[% course.course_name %]
    Term[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]
    Department_[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]
    Course number[% course.course_number %]
    Section[% course.section %]
    Instructors[% FOREACH i IN course.instructors %]
    [% i.firstname %] [% i.surname %]
    [% END %]
    Staff note[% course.staff_note %]
    Public note[% course.public_note %]
    Students count[% course.students_count %]
    Status[% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]
    + + + + + + + + [% IF item_level_itypes %][% END %] + + + + + + [% IF CAN_user_coursereserves_add_reserves %][% END %] + [% IF CAN_user_coursereserves_delete_reserves %][% END %] + + + + + + [% FOREACH cr IN course_reserves %] + + + + + [% IF item_level_itypes %] + + [% END %] + + + + + + + [% IF CAN_user_coursereserves_add_reserves %] + + [% END %] + + [% IF CAN_user_coursereserves_delete_reserves %] + + [% END %] + + + + [% END %] + +
    TitleBarcodeCall numberItem typeCollectionLocationLibraryStaff notePublic note  Other course reserves
    [% cr.item.title %][% cr.item.barcode %][% cr.item.itemcallnumber %] + [% IF cr.course_item.itype %] + [% IF cr.course_item.enabled == 'yes' %] + [% ItemTypes.GetDescription( cr.item.itype ) %] + [% ELSE %] + [% ItemTypes.GetDescription( cr.course_item.itype ) %] + [% END %] + [% ELSE %] + Unchanged + ([% ItemTypes.GetDescription( cr.item.itype ) %]) + [% END %] + + [% IF cr.course_item.ccode %] + [% IF cr.course_item.enabled == 'yes' %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %] + [% ELSE %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) %] + [% END %] + [% ELSE %] + Unchanged + ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]) + [% END %] + + [% IF cr.course_item.location %] + [% IF cr.course_item.enabled == 'yes' %] + [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %] + [% ELSE %] + [% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) %] + [% END %] + [% ELSE %] + Unchanged + ([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]) + [% END %] + + [% IF cr.course_item.holdingbranch %] + [% IF cr.course_item.enabled == 'yes' %] + [% Branches.GetName( cr.item.holdingbranch ) %] + [% ELSE %] + [% Branches.GetName( cr.course_item.holdingbranch ) %] + [% END %] + [% ELSE %] + Unchanged + ([% Branches.GetName( cr.item.holdingbranch ) %]) + [% END %] + [% cr.staff_note %][% cr.public_note %]Edit + [% IF cr.item.onloan %] + On Loan + [% ELSIF cr.item.itemlost %] + Item Lost + [% ELSE %] + Remove + [% END %] + + + [% FOREACH course IN cr.courses %] + [% UNLESS cr.course_id == course.course_id %] +

    + + [% course.course_name %] + [% IF course.section %] [% course.section %] [% END %] + [% IF course.term %] [% AuthorisedValues.GetByCode( 'TERM', course.term ) %] [% END %] + +

    + [% END %] + [% END %] +
    +
    +
    +
    + + +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt new file mode 100644 index 0000000..dfae703 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt @@ -0,0 +1,119 @@ +[% USE AuthorisedValues %] +[% INCLUDE 'doc-head-open.inc' %] +Koha › Course reserves +[% INCLUDE 'doc-head-close.inc' %] + + + +[% INCLUDE 'datatables-strings.inc' %] + + + + + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'cat-search.inc' %] + + + +
    +
    +
    +
    +
    + +
    + +
      + [% IF ( CAN_user_coursereserves_manage_courses ) %] +
    • New course
      • + [% END %] +
    +
    + + + +

    Courses

    + + + + + + + + + + + + + + + + + + [% FOREACH c IN courses %] + + + + + + + + + + + + [% END %] + +
    NameDept.Course #SectionTermInstructorsStaff notePublic note# of StudentsEnabled
    [% c.course_name %][% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) %][% c.course_number %][% c.section %][% AuthorisedValues.GetByCode( 'TERM' c.term ) %] + [% FOREACH i IN c.instructors %] +
    [% i.firstname %] [% i.surname %]
    + [% END %] +     		[% c.staff_note %][% c.public_note %][% c.students_count %] + [% IF c.enabled == 'yes' %] + + [% ELSE %] + + [% END %] +
    +
    +
    +
    +
    +
    + + +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt new file mode 100644 index 0000000..14498fa --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt @@ -0,0 +1,205 @@ +[% INCLUDE 'doc-head-open.inc' %] +Koha › Course reserves › [% IF course_name %] Edit [% course_name %] [% ELSE %] New course [% END %] +[% INCLUDE 'doc-head-close.inc' %] + + + + + + + + + +[% INCLUDE 'header.inc' %] +[% INCLUDE 'cat-search.inc' %] + + + +
    +
    +
    +
    +
    +
    + + [% IF course_id %][% END %] +
    + [% IF course_id %] Edit [% ELSE %] Create [% END %] course +
      +
    1. + + [% IF departments %] + + [% ELSE %] + No DEPARTMENT authorised values found! Please create one or more authorised values with the category DEPARTMENT. + [% END %] +
      2. + +
    2. + + +
      3. + +
    3. + + +
      4. + +
    4. + + +
      5. + +
    5. + + [% IF terms %] + + [% ELSE %] + No TERM authorised values found! Please create one or more authorised values with the category TERM. + [% END %] +
      6. + + +
    6. + + +
      +
      + [% FOREACH i IN instructors %] +
      + [% i.surname %], [% i.firstname %] ( Remove ) + +
      + [% END %] +
      + +
      + +
      + + +
      +
      +
    7. + + +
      8. + +
    8. + + +
      9. + +
    9. + + +
      10. + +
    10. + + [% IF enabled == 'no' %] + + [% ELSE %] + + [% END %] +
      11. +
    +
    + +
    + + + Cancel +
    + +
    +
    +
    +
    +
    +
    + + +[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index 52264ee..ff2b6b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -4,8 +4,8 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index dc9aac4..30a4e20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -4,8 +4,8 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 68d6a30..44541aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -6,7 +6,7 @@ @@ -1469,6 +1483,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% ELSIF show_priority %] Item hold queue priority [% END %] + [% IF ( ShowCourseReservesHeader ) %]Course Reserves[% END %] [% FOREACH ITEM_RESULT IN items %] [% IF ( item_level_itypes ) %][% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %][% ITEM_RESULT.description %][% END %][% END %] [% ITEM_RESULT.description %][% END %] @@ -1515,6 +1530,22 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% END %] [% END %] + [% IF ShowCourseReservesHeader %] + + [% IF ITEM_RESULT.course_reserves %] + [% FOREACH r IN ITEM_RESULT.course_reserves %] +

    + + [% r.course.course_name %] + + [% IF r.course.section %] [% r.course.section %] [% END %] + [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %] + +

    + [% END %] + [% END %] + + [% END %] [% END %] diff --git a/opac/opac-course-details.pl b/opac/opac-course-details.pl new file mode 100755 index 0000000..ee505c9 --- /dev/null +++ b/opac/opac-course-details.pl @@ -0,0 +1,60 @@ +#!/usr/bin/perl + +# +# Copyright 2012 Bywater Solutions +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; + +use C4::Auth; +use C4::Output; +use C4::Koha; + +use C4::CourseReserves; + +my $cgi = new CGI; + +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-course-details.tmpl", + query => $cgi, + type => "opac", + authnotrequired => 1, + debug => 1, + } +); + +my $action = $cgi->param('action') || ''; +my $course_id = $cgi->param('course_id'); + +die( "No course_id given" ) unless ( $course_id ); + +if ( $action eq 'del_reserve' ) { + DelCourseReserve( cr_id => $cgi->param('cr_id') ); +} + +my $course = GetCourse( $course_id ); +my $course_reserves = GetCourseReserves( course_id => $course_id, include_items => 1, include_count => 1 ); + +$template->param( + course => $course, + course_reserves => $course_reserves, +); + +output_html_with_http_headers $cgi, $cookie, $template->output; diff --git a/opac/opac-course-reserves.pl b/opac/opac-course-reserves.pl new file mode 100755 index 0000000..60f8f15 --- /dev/null +++ b/opac/opac-course-reserves.pl @@ -0,0 +1,51 @@ +#!/usr/bin/perl + +# +# Copyright 2012 Bywater Solutions +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; + +use C4::Auth; +use C4::Output; + +use C4::CourseReserves; + +my $cgi = new CGI; + +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-course-reserves.tmpl", + query => $cgi, + type => "opac", + authnotrequired => 1, + debug => 1, + } +); + +my $search_on = $cgi->param('search_on'); + +my $courses = SearchCourses( term => $search_on, enabled => 'yes' ); + +if ( @$courses == 1 ) { + print $cgi->redirect("/cgi-bin/koha/opac-course-details.pl?course_id=" . $courses->[0]->{'course_id'}); +} else { + $template->param( courses => $courses ); + output_html_with_http_headers $cgi, $cookie, $template->output; +} diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 068122e..9964ef9 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -50,6 +50,7 @@ use List::MoreUtils qw/any none/; use C4::Images; use Koha::DateUtils; use C4::HTML5Media; +use C4::CourseReserves; BEGIN { if (C4::Context->preference('BakerTaylorEnabled')) { @@ -1008,4 +1009,10 @@ if (C4::Context->preference('OpacHighlightedWords')) { } $template->{VARS}->{'trackclicks'} = C4::Context->preference('TrackClicks'); +if ( C4::Context->preference('UseCourseReserves') ) { + foreach my $i ( @items ) { + $i->{'course_reserves'} = GetItemReservesInfo( itemnumber => $i->{'itemnumber'} ); + } +} + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/t/db_dependent/CourseReserves.t b/t/db_dependent/CourseReserves.t new file mode 100755 index 0000000..4b8fe41 --- /dev/null +++ b/t/db_dependent/CourseReserves.t @@ -0,0 +1,88 @@ +#!/usr/bin/perl +# +# This is to test C4/Members +# It requires a working Koha database with the sample data + +use strict; +use warnings; + +use Test::More tests => 16; +use Data::Dumper; + +BEGIN { + use_ok('C4::Context'); + use_ok('C4::CourseReserves'); +} + +my $dbh = C4::Context->dbh; +$dbh->do("TRUNCATE TABLE course_instructors"); +$dbh->do("TRUNCATE TABLE courses"); +$dbh->do("TRUNCATE TABLE course_reserves"); + +my $sth = $dbh->prepare("SELECT * FROM borrowers ORDER BY RAND() LIMIT 10"); +$sth->execute(); +my @borrowers = @{$sth->fetchall_arrayref({})}; + +$sth = $dbh->prepare("SELECT * FROM items ORDER BY RAND() LIMIT 10"); +$sth->execute(); +my @items = @{$sth->fetchall_arrayref({})}; + +my $course_id = ModCourse( + course_name => "Test Course", + staff_note => "Test staff note", + public_note => "Test public note", +); + +ok( $course_id, "ModCourse created course successfully" ); + +$course_id = ModCourse( + course_id => $course_id, + staff_note => "Test staff note 2", +); + +my $course = GetCourse( $course_id ); + +ok( $course->{'course_name'} eq "Test Course", "GetCourse returned correct course" ); +ok( $course->{'staff_note'} eq "Test staff note 2", "ModCourse updated course succesfully" ); + +my $courses = GetCourses(); +ok( $courses->[0]->{'course_name'} eq "Test Course", "GetCourses returns valid array of course data" ); + +ModCourseInstructors( mode => 'add', course_id => $course_id, borrowernumbers => [ $borrowers[0]->{'borrowernumber'} ] ); +$course = GetCourse( $course_id ); +ok( $course->{'instructors'}->[0]->{'borrowernumber'} == $borrowers[0]->{'borrowernumber'}, "ModCourseInstructors added instructors correctly"); + +my $course_instructors = GetCourseInstructors( $course_id ); +ok( $course_instructors->[0]->{'borrowernumber'} eq $borrowers[0]->{'borrowernumber'}, "GetCourseInstructors returns valid data" ); + +my $ci_id = ModCourseItem( 'itemnumber' => $items[0]->{'itemnumber'} ); +ok( $ci_id, "ModCourseItem returned valid data" ); + +my $course_item = GetCourseItem( 'ci_id' => $ci_id ); +ok( $course_item->{'itemnumber'} eq $items[0]->{'itemnumber'}, "GetCourseItem returns valid data" ); + +my $cr_id = ModCourseReserve( 'course_id' => $course_id, 'ci_id' => $ci_id ); +ok( $cr_id, "ModCourseReserve returns valid data" ); + +my $course_reserve = GetCourseReserve( 'course_id' => $course_id, 'ci_id' => $ci_id ); +ok( $course_reserve->{'cr_id'} eq $cr_id, "GetCourseReserve returns valid data" ); + +my $course_reserves = GetCourseReserves( 'course_id' => $course_id ); +ok( $course_reserves->[0]->{'ci_id'} eq $ci_id, "GetCourseReserves returns valid data." ); + +my $info = GetItemReservesInfo( itemnumber => $items[0]->{'itemnumber'} ); +ok( $info->[0]->{'itemnumber'} eq $items[0]->{'itemnumber'}, "GetItemReservesInfo returns valid data." ); + +DelCourseReserve( 'cr_id' => $cr_id ); +$course_reserve = GetCourseReserve( 'cr_id' => $cr_id ); +ok( !defined( $course_reserve->{'cr_id'} ), "DelCourseReserve functions correctly" ); + +DelCourse( $course_id ); +$course = GetCourse( $course_id ); +ok( !defined( $course->{'course_id'} ), "DelCourse deleted course successfully" ); + +$dbh->do("TRUNCATE TABLE course_instructors"); +$dbh->do("TRUNCATE TABLE courses"); +$dbh->do("TRUNCATE TABLE course_reserves"); + +exit; -- 1.7.2.5