Attachment #11882 for bug #8215

View | Details | Raw Unified | Return to bug 8215
Collapse All | Expand All




            $template->param( CAN_user_reserveforothers => 1 );
            $template->param( CAN_user_borrow           => 1 );
            $template->param( CAN_user_editcatalogue    => 1 );
            $template->param( CAN_user_updatecharges    => 1 );
            $template->param( CAN_user_acquisition      => 1 );
            $template->param( CAN_user_management       => 1 );
            $template->param( CAN_user_tools            => 1 );

            $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 );

            using_https                  => $in->{'query'}->https() ? 1 : 0,
            noItemTypeImages             => C4::Context->preference("noItemTypeImages"),
            marcflavour                  => C4::Context->preference("marcflavour"),
            UseCourseReserves            => C4::Context->preference("UseCourseReserves"),
    );

    if ( $in->{'type'} eq "intranet" ) {

Lines 41-46 BEGIN { Link Here

(-)a/C4/Koha.pm (-5 / +20 lines)
41	&subfield_is_koha_internal_p	41	&subfield_is_koha_internal_p
42	&GetPrinters &GetPrinter	42	&GetPrinters &GetPrinter
43	&GetItemTypes &getitemtypeinfo	43	&GetItemTypes &getitemtypeinfo
		44	&GetItemTypesFlat
44	&GetCcodes	45	&GetCcodes
45	&GetSupportName &GetSupportList	46	&GetSupportName &GetSupportList
46	&get_itemtypeinfos_of	47	&get_itemtypeinfos_of
Lines 256-261 sub GetItemTypes { Link Here
256	return ( \%itemtypes );	257	return ( \%itemtypes );
257	}	258	}
258		259
		260	sub GetItemTypesFlat {
		261	my $dbh = C4::Context->dbh;
		262	my $query = "SELECT * FROM itemtypes ORDER BY description";
		263	my $sth = $dbh->prepare($query);
		264	$sth->execute;
		265
		266	return $sth->fetchall_arrayref({});
		267	}
		268
259	sub get_itemtypeinfos_of {	269	sub get_itemtypeinfos_of {
260	my @itemtypes = @_;	270	my @itemtypes = @_;
261		271
Lines 1065-1071 sub GetAuthorisedValueCategories { Link Here
1065		1075
1066	=head2 GetAuthorisedValueByCode	1076	=head2 GetAuthorisedValueByCode
1067		1077
1068	$authhorised_value = GetAuthorisedValueByCode( $category, $authvalcode );	1078	$authorised_value = GetAuthorisedValueByCode( $category, $authvalcode, $opac );
1069		1079
1070	Return the lib attribute from authorised_values from the row identified	1080	Return the lib attribute from authorised_values from the row identified
1071	by the passed category and code	1081	by the passed category and code
Lines 1073-1085 by the passed category and code Link Here
1073	=cut	1083	=cut
1074		1084
1075	sub GetAuthorisedValueByCode {	1085	sub GetAuthorisedValueByCode {
1076	my ( $category, $authvalcode ) = @_;	1086	my ( $category, $authvalcode, $opac ) = @_;
1077		1087
1078	my $dbh = C4::Context->dbh;	1088	my $dbh = C4::Context->dbh;
1079	my $sth = $dbh->prepare("SELECT lib FROM authorised_values WHERE category=? AND authorised_value =?");	1089	my $sth = $dbh->prepare("SELECT lib, lib_opac FROM authorised_values WHERE category=? AND authorised_value =?");
1080	$sth->execute( $category, $authvalcode );	1090	$sth->execute( $category, $authvalcode );
1081	while ( my $data = $sth->fetchrow_hashref ) {	1091
1082	return $data->{'lib'};	1092	my $row = $sth->fetchrow_hashref();
		1093
		1094	if ( $opac ) {
		1095	return $row->{'lib_opac'} \|\| $row->{'lib'};
		1096	} else {
		1097	return $row->{'lib'};
1083	}	1098	}
1084	}	1099	}
1085		1100




package Koha::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

Koha::CourseReserves - Koha course reserves module

=head1 SYNOPSIS

use Koha::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 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'};

    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

    @borrowernumbers = GetCourseInstructors( $course_id );

=cut

sub GetCourseInstructors {
    my ($course_id) = @_;
    warn "Koha::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 "Koha::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 <kyle@bywatersolutions.com>

=cut




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 C4::Koha;

sub GetByCode {
    my ( $self, $category, $code, $opac ) = @_;
    return GetAuthorisedValueByCode( $category, $code, $opac );
}

1;




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;




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;

Lines 261-266 my $target_map = { Link Here

(-)a/Makefile.PL (+1 lines)
261	'./changelanguage.pl' => 'INTRANET_CGI_DIR',	261	'./changelanguage.pl' => 'INTRANET_CGI_DIR',
262	'./check_sysprefs.pl' => 'NONE',	262	'./check_sysprefs.pl' => 'NONE',
263	'./circ' => 'INTRANET_CGI_DIR',	263	'./circ' => 'INTRANET_CGI_DIR',
		264	'./course_reserves' => 'INTRANET_CGI_DIR',
264	'./offline_circ' => 'INTRANET_CGI_DIR',	265	'./offline_circ' => 'INTRANET_CGI_DIR',
265	'./edithelp.pl' => 'INTRANET_CGI_DIR',	266	'./edithelp.pl' => 'INTRANET_CGI_DIR',
266	'./etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 },	267	'./etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 },

Lines 40-45 use C4::VirtualShelves; Link Here

(-)a/catalogue/detail.pl (+6 lines)
40	use C4::XSLT;	40	use C4::XSLT;
41	use C4::Images;	41	use C4::Images;
42	use Koha::DateUtils;	42	use Koha::DateUtils;
		43	use Koha::CourseReserves;
43		44
44	# use Smart::Comments;	45	# use Smart::Comments;
45		46
Lines 264-269 foreach my $item (@items) { Link Here
264	if ($item->{'materials'} ne ''){	265	if ($item->{'materials'} ne ''){
265	$materials_flag = 1;	266	$materials_flag = 1;
266	}	267	}
		268
		269	if ( C4::Context->preference('UseCourseReserves') ) {
		270	$item->{'course_reserves'} = GetItemReservesInfo( itemnumber => $item->{'itemnumber'} );
		271	}
		272
267	push @itemloop, $item;	273	push @itemloop, $item;
268	}	274	}
269		275




#!/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 Koha::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 = GetCourseReserve(
        course_id => $course_id,
        ci_id     => $course_item->{'ci_id'}
    ) if ($course_item);

    $template->param(
        item           => $item,
        course_item    => $course_item,
        course_reserve => $course_reserve,

        ccodes    => GetAuthorisedValues('CCODE'),
        locations => GetAuthorisedValues('LOC'),
        itypes    => GetItemTypesFlat(),
        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;




#!/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 Koha::CourseReserves;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "course_reserves/course-details.tmpl",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { coursereserves => 'manage_courses' },
    }
);

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_courses => 1
);

$template->param(
    course          => $course,
    course_reserves => $course_reserves,
);

output_html_with_http_headers $cgi, $cookie, $template->output;




#!/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 Koha::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   => { coursereserves => 'manage_courses' },
    }
);

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;
}




#!/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 Koha::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 => 1 },
    }
);

my $course_id = $cgi->param('course_id');

if ($course_id) {
    my $course = GetCourse($course_id);
    $template->param(%$course);
}

$template->param(
    departments => GetAuthorisedValues('DEPARTMENT')
    ,    ## TODO: use syspref instead of hard coded value.
    terms => GetAuthorisedValues('TERM')
    ,    ## TODO: use syspref instead of hard coded value.
);

output_html_with_http_headers $cgi, $cookie, $template->output;




#!/usr/bin/perl

#script to modify reserves/requests
#written 2/1/00 by chris@katipo.oc.nz
#last update 27/1/2000 by chris@katipo.co.nz

# Copyright 2000-2002 Katipo Communications
#
# 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 Koha::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 => 1 },
    }
);

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");
}

Lines 15-17 INSERT INTO `userflags` VALUES(14,'editauthorities','Allow to edit authorities', Link Here

(-)a/installer/data/mysql/en/mandatory/userflags.sql (+1 lines)
15	INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0);	15	INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0);
16	INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0);	16	INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0);
17	INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0);	17	INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0);
		18	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);

Lines 51-55 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (-1 / +4 lines)
51	(15, 'renew_subscription', 'Renew a subscription'),	51	(15, 'renew_subscription', 'Renew a subscription'),
52	(15, 'routing', 'Routing'),	52	(15, 'routing', 'Routing'),
53	(16, 'execute_reports', 'Execute SQL reports'),	53	(16, 'execute_reports', 'Execute SQL reports'),
54	(16, 'create_reports', 'Create SQL Reports')	54	(16, 'create_reports', 'Create SQL Reports'),
		55	(18, 'manage_courses', 'Add, edit and delete courses'),
		56	(18, 'add_reserves', 'Add course reserves'),
		57	(18, 'delete_reserves', 'Remove course reserves')
55	;	58	;




) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;

--
-- Table structure for table `courses`
--
DROP TABLE IF EXISTS courses;
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;

--
-- Table structure for table `course_instructors`
--
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;

--
-- Table structure for table `course_items`
--
DROP TABLE IF EXISTS course_items;
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`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;

--
-- Table structure for table `course_reserves`
--
DROP TABLE IF EXISTS course_reserves;
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 `psuedo_key` (`course_id`,`ci_id`),
   KEY `course_id` (`course_id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;

--
-- Table structure for table `borrower_branch_circ_rules`
--


Lines 374-376 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
374	INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo');	374	INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo');
375	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo');	375	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo');
376	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free');	376	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free');
		377	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');




    SetVersion($DBversion);
}

$DBversion = "3.09.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("
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`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
");

$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 `psuedo_key` (`course_id`,`ci_id`),
   KEY `course_id` (`course_id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
");

$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)

Lines 809-815 fieldset.rows .inputnote { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (-1 / +1 lines)
809	visibility:visible; /* you propably don't need to change this one */	809	visibility:visible; /* you propably don't need to change this one */
810	display:block;	810	display:block;
811	}	811	}
812	#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 {	812	#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 {
813	padding-left : 34px;	813	padding-left : 34px;
814	background-image: url("../../img/toolbar-new.gif");	814	background-image: url("../../img/toolbar-new.gif");
815	background-position : center left;	815	background-position : center left;

Lines 28-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (+3 lines)
28	[% IF ( CAN_user_serials ) %]	28	[% IF ( CAN_user_serials ) %]
29	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>	29	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
30	[% END %]	30	[% END %]
		31	[% IF ( CAN_user_coursereserves ) %]
		32	<li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a></li>
		33	[% END %]
31	[% IF ( CAN_user_reports ) %]	34	[% IF ( CAN_user_reports ) %]
32	<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>	35	<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
33	[% END %]	36	[% END %]

Lines 51-56 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc (+3 lines)
51	[% IF ( CAN_user_serials ) %]	51	[% IF ( CAN_user_serials ) %]
52	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>	52	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
53	[% END %]	53	[% END %]
		54	[% IF ( CAN_user_coursereserves ) %]
		55	<li><a href="/cgi-bin/koha/course_reserves/course_reserves.pl">Course Reserves</a></li>
		56	[% END %]
54	[% IF ( CAN_user_editcatalogue ) %]	57	[% IF ( CAN_user_editcatalogue ) %]
55	</ul></li>	58	</ul></li>
56		59

Lines 5-15 function _(s) { return s } // dummy function for gettext Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js (-19 / +10 lines)
5		5
6	$(document).ready(function() {	6	$(document).ready(function() {
7	$('#header_search').tabs().bind('tabsshow', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });	7	$('#header_search').tabs().bind('tabsshow', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });
8	$(".close").click(function(){ window.close(); });	8
		9	$(".close").click(function(){ window.close(); });
		10
9	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"; }); }	11	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"; }); }
10	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"; }); }	12	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"; }); }
11	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"; }); }	13	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"; }); }
		14
12	$(".focus").focus();	15	$(".focus").focus();
		16
		17	$('.noEnterSubmit').keypress(function(e){
		18	if ( e.which == 13 ) return false;
		19	//if ( e.which == 13 ) e.preventDefault();
		20	});
		21
13	});	22	});
14		23
15		24
Lines 73-96 YAHOO.util.Event.onContentReady("changelanguage", function () { Link Here
73	});	82	});
74	});	83	});
75		84
76	// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
77	function checkEnter(e){ //e is event object passed from function invocation
78	var characterCode; // literal character code will be stored in this variable
79	if(e && e.which){ //if which property of event object is supported (NN4)
80	e = e;
81	characterCode = e.which; //character code is contained in NN4's which property
82	} else {
83	e = event;
84	characterCode = e.keyCode; //character code is contained in IE's keyCode property
85	}
86
87	if(characterCode == 13){ //if generated character code is equal to ascii 13 (if enter key)
88	return false;
89	} else {
90	return true;
91	}
92	}
93
94	function clearHoldFor(){	85	function clearHoldFor(){
95	$.cookie("holdfor",null, { path: "/", expires: 0 });	86	$.cookie("holdfor",null, { path: "/", expires: 0 });
96	}	87	}

Lines 439-441 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+7 lines)
439	- and this password	439	- and this password
440	- pref: AutoSelfCheckPass	440	- pref: AutoSelfCheckPass
441	- .	441	- .
		442	Course Reserves:
		443	-
		444	- pref: UseCourseReserves
		445	choices:
		446	yes: Use
		447	no: "Don't use"
		448	- course reserves




[% USE AuthorisedValues %]

[% ShowCourseReserves = 0 %]
[% IF UseCourseReserves %]
    [% FOREACH item IN itemloop %]
        [% IF item.course_reserves %]
            [% IF item.course_reserves.course.enabled == 'yes' %]
                [% ShowCourseReserves = 1 %]
            [% END %]
        [% END %]
    [% END %]
[% END %]

[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Catalog &rsaquo;
  [% IF ( unknownbiblionumber ) %]

        [% 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>
            [% FOREACH itemloo IN itemloop %]
                <tr>

                        <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% itemloo.biblionumber %]&amp;hostitemnumber=[% itemloo.itemnumber %]">Create analytics</a></td>
                [% END %]

                [% IF ShowCourseReserves %]
                    <td>
                        [% IF itemloo.course_reserves %]
                            [% FOREACH r IN itemloo.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 %]
        </table>

Lines 9-15 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-1 / +1 lines)
9	window.close();	9	window.close();
10	[% END %]	10	[% END %]
11	[% END %]	11	[% END %]
12	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });	12	$("fieldset.rows input").addClass("noEnterSubmit");
13	/* Inline edit/delete links */	13	/* Inline edit/delete links */
14	var biblionumber = $("input[name='biblionumber']").attr("value");	14	var biblionumber = $("input[name='biblionumber']").attr("value");
15	$("td").click(function(event){	15	$("td").click(function(event){




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course Reserves &rsaquo; Add Items</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<script type="text/javascript">
//<![CDATA[

$(document).ready(function() {
  $('#barcode').focus();
});

//]]>
</script>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Add Reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">
                    <div class="yui-u first">
                        [% IF ERROR_BARCODE_NOT_FOUND %]
                            <div class="error">No item found for barcode [% ERROR_BARCODE_NOT_FOUND %]</div>
                        [% END %]

                        <form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
                            <input type="hidden" name="course_id" value="[% course.course_id %]" />
                            <input type="hidden" name="action" value="lookup" />

                            <fieldset class="rows">
                                <legend>Add Items: Scan Barcode</legend>

                                    <p>

                                    <li>
                                        <label class="required" for="barcode">Item Barcode:</label>
                                        <input id="barcode" name="barcode" type="text" />
                                    </li>
                                </ol>
                            </fieldset>

                            <fieldset class="action">
                                <input type="submit" value="Submit" class="submit" />

                                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
                            </fieldset>
                        </form>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course Reserves &rsaquo; Add Items</title>
[% INCLUDE 'doc-head-close.inc' %]

<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
  $('#submit').focus();
});
//]]>
</script>

</head>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Reserve <i><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% item.title %]</a></i> for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">
                    <div class="yui-u first">
                        [% IF course_reserve %]<div class="warn" id="already_on_reserve_this">This course already has this item on reserve.<div>[% END %]
                        [% IF course_item    %]<div class="warn" id="already_on_reserve">Number of courses reserving this item: [% course_item.course_reserves.size %]<div>[% END %]

                        <form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
                            <input type="hidden" name="course_id" value="[% course.course_id %]" />
                            <input type="hidden" name="action" value="add" />

                            <fieldset class="rows">
                                <legend>Add <i>[% item.title %]</i> to <i>[% course.course_name %]</i></legend>
                                <ol>
                                    <li>
                                        <label for="barcode">Barcode:</label>
                                        <span id="barcode">[% item.barcode %]</span>
                                        <input type="hidden" name="itemnumber" value="[% item.itemnumber %]" />
                                    </li>

                                    <li>
                                        <label class="required" for="itype">Item Type:</label>
                                        <select id="itype" name="itype">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH it IN itypes %]
                                                [% IF course_item.itype && ( ( course.enabled == 'yes' && it.itemtype == item.itype ) || ( course.enabled == 'no' && it.itemtype == course_item.itype ) ) %]
                                                    <option value="[% it.itemtype %]" selected="selected">[% it.description %]</option>
                                                [% ELSE %]
                                                    <option value="[% it.itemtype %]">[% it.description %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label class="required" for="ccode">Collection Code:</label>
                                        <select id="ccode" name="ccode">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH c IN ccodes %]
                                                [% IF course_item.ccode && ( ( course.enabled == 'yes' && c.authorised_value == item.ccode ) || ( course.enabled == 'no' && c.authorised_value == course_item.ccode ) ) %]
                                                    <option value="[% c.authorised_value %]" selected="selected">[% c.lib %]</option>
                                                [% ELSE %]
                                                    <option value="[% c.authorised_value %]">[% c.lib %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label class="required" for="location">Shelving Location:</label>
                                        <select id="location" name="location">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH s IN locations %]
                                                [% IF course_item.location && ( ( course.enabled == 'yes' && s.authorised_value == item.location ) || ( course.enabled == 'no' && s.authorised_value == course_item.location ) ) %]
                                                    <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
                                                [% ELSE %]
                                                    <option value="[% s.authorised_value %]">[% s.lib %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label class="required" for="holdingbranch">Holding Library:</label>
                                        <select id="holdingbranch" name="holdingbranch">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH b IN branches %]
                                                [% IF course_item.holdingbranch && ( ( course.enabled == 'yes' && b.value == item.holdingbranch ) || ( course.enabled == 'no' && b.value == course_item.holdingbranch ) ) %]
                                                    <option value="[% b.value %]" selected="selected">[% b.branchname %]</option>
                                                [% ELSE %]
                                                    <option value="[% b.value %]">[% b.branchname %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label for="staff_note">Staff note:</label>
                                        <textarea name="staff_note" id="staff_note">[% course_reserve.staff_note %]</textarea>
                                    </li>

                                    <li>
                                        <label for="public_note">Public note:</label>
                                        <textarea name="public_note" id="public_note">[% course_reserve.public_note %]</textarea>
                                    </li>

                                </ol>
                            </fieldset>

                            <fieldset class="action">
                                <input type="submit" id="submit" value="Save" class="submit" />

                                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
                            </fieldset>

                    </div>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% USE AuthorisedValues %]
[% USE ItemTypes %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course Reserves &rsaquo; New Course</title>
[% INCLUDE 'doc-head-close.inc' %]

<script type="text/javascript">
//<![CDATA[

    function confirmItemDelete(){
        return confirm( _('Are you sure you want to delete this item?');
    }

//]]>
</script>

</head>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Course Details for <i>[% course.course_name %]</i></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div id="toolbar">
                <script type="text/javascript">
                //<![CDATA[
                    $(document).ready(function(){
                        addItemsButton     = new YAHOO.widget.Button("add_items");
                        editCourseButton   = new YAHOO.widget.Button("edit_course");
                        deleteCourseButton = new YAHOO.widget.Button("delete_course");

                        deleteCourseButton.on("click", confirmDelete );
                    });

                    function confirmDelete(p_oEvent){
                        if ( ! confirm( _('Are you sure you want to delete this course?') ) ) {
                            YAHOO.util.Event.stopEvent( p_oEvent );
                        }
                    }

                //]]>
                </script>
                <ul class="toolbar">
                    [% IF CAN_user_coursereserves_add_reserves %]<li><a id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]">Add Reserves</a></li>[% END %]
                    <li><a id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]">Edit Course</a></li>
                    <li><a id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del">Delete Course</a></li>
                </ul>
            </div><!-- /toolbar -->

            <table>
                <tr><th>Course name</th><td>[% course.course_name %]</td></tr>
                <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
                <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
                <tr><th>Course number</th><td>[% course.course_number %]</td></tr>
                <tr><th>Section</th><td>[% course.section %]</td></tr>
                <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>[% END %]</td></tr>
                <tr><th>Staff note</th><td>[% course.staff_note %]</td></tr>
                <tr><th>Public note</th><td>[% course.public_note %]</td></tr>
                <tr><th>Students count</th><td>[% course.students_count %]</td></tr>
                <tr><th>Status</th><td>[% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</td></tr>
            </table>

            <table>
                <thead>
                    <tr>
                        <th>Title</th>
                        <th>Barcode</th>
                        <th>Call number</th>
                        <th>Item type</th>
                        <th>Collection</th>
                        <th>Location</th>
                        <th>Library</th>
                        <th>Staff note</th>
                        <th>Public note</th>
                        [% IF CAN_user_coursereserves_add_reserves %]<th>&nbsp;<!-- Edit --></th>[% END %]
                        [% IF CAN_user_coursereserves_delete_reserves %]<th>&nbsp;<!-- Remove --></th>[% END %]
                        <th>Other course reserves</th>
                    </tr>
                </thead>

                <tbody>
                    [% FOREACH cr IN course_reserves %]
                        <tr>
                            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
                            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber %]&biblionumber=[% cr.item.biblionumber %]&bi=[% cr.item.biblioitemnumber %]">[% cr.item.barcode %]</a></td>
                            <td>[% cr.item.itemcallnumber %]</td>
                            <td>
                                [% 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 %]
                                     <i>Unchanged</i>
                                [% END %]
                            </td>
                            <td>
                                 [% 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 %]
                                     <i>Unchanged</i>
                                 [% END %]
                            </td>
                            <td>
                                [% 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 %]
                                    <i>Unchanged</i>
                                [% END %]
                            </td>
                            <td>
                                [% 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 %]
                                    <i>Unchanged</i>
                                [% END %]
                            </td>
                            <td>[% cr.staff_note %]</td>
                            <td>[% cr.public_note %]</td>

                            [% IF CAN_user_coursereserves_add_reserves %]
                                <td><a href="add_items.pl?course_id=[% course.course_id %]&barcode=[% cr.item.barcode %]&action=lookup">Edit</a></td>
                            [% END %]

                            [% IF CAN_user_coursereserves_delete_reserves %]
                                <td>
                                    [% IF cr.item.onloan %]
                                        On Loan
                                    [% ELSIF cr.item.itemlost %]
                                        Item Lost
                                    [% ELSE %]
                                        <a href="course-details.pl?course_id=[% course.course_id %]&action=del_reserve&cr_id=[% cr.cr_id %]" onclick="return confirmItemDelete()" >Remove</a>
                                    [% END %]

                                </td>
                            [% END %]

                            <td>
                                [% FOREACH course IN cr.courses %]
                                    [% UNLESS cr.course_id == course.course_id %]
                                        <p>
                                            <a href="course-details.pl?course_id=[% course.course_id %]">
                                                [% course.course_name %]
                                                [% IF course.section %] [% course.section %] [% END %]
                                                [% IF course.term %] [% AuthorisedValues.GetByCode( 'TERM', course.term ) %] [% END %]
                                            </a>
                                        </p>
                                    [% END %]
                                [% END %]
                            </td>
                        </tr>
                    [% END %]
                </tbody>
            </table>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% USE AuthorisedValues %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course Reserves</title>
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
</head>
<body id="lists_shelves" class="lists">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">

                    <div id="toolbar">
                        <script type="text/javascript">
                        //<![CDATA[
                            $(document).ready(function(){
                                newCourseButton = new YAHOO.widget.Button("new_course");
                            });
                        //]]>
                        </script>
                        <ul class="toolbar">
                            <li><a id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New Course</a></li>
                        </ul>
                    </div><!-- /toolbar -->

                    <div id="search-toolbar">
                        <script type="text/javascript">
                        //<![CDATA[
                            function submitSearchForm(p_oEvent){
                                $('#search_courses_form').submit();
                            }

                            $(document).ready(function(){
                                newCourseButton = new YAHOO.widget.Button("search_courses");
                                newCourseButton.on("click", submitSearchForm );
                            });
                        //]]>
                        </script>
                        <ul class="toolbar">
                            <li><form id="search_courses_form"><input type="text" name="search_on" id="search_on"></form></li>
                            <li><a id="search_courses">Search Courses</a></li>
                        </ul>
                    </div><!-- /toolbar -->

                    <h1>Courses</h1>
                    <table id="course_reserves_table">
                        <thead>
                            <tr>
                                <th>Name</th>
                                <th>Dept.</th>
                                <th>Course #</th>
                                <th>Section</th>
                                <th>Term</th>
                                <th>Instructors</th>
                                <th>Staff Note</th>
                                <th>Public Note</th>
                                <th># of Students</th>
                                <th>Enabled</th>
                            </tr>
                        </thead>

                        <tbody>
                            [% FOREACH c IN courses %]
                                <tr>
                                    <td><a href="course-details.pl?course_id=[% c.course_id %]">[% c.course_name %]</a></td>
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) %]</td>
                                    <td>[% c.course_number %]</td>
                                    <td>[% c.section %]</td>
                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) %]</td>
                                    <td>
                                        [% FOREACH i IN c.instructors %]
                                            <div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>
                                        [% END %]
                                    </td>
                                    <td>[% c.staff_note %]</td>
                                    <td>[% c.public_note %]</td>
                                    <td>[% c.students_count %]</td>
                                    <td>
                                        [% IF c.enabled == 'yes' %]
                                            <img src="/intranet-tmpl/prog/img/approve.gif" />
                                        [% ELSE %]
                                            <img src="http://kohadev:8080/intranet-tmpl/prog/img/deny.gif" />
                                        [% END %]
                                    </td>
                            [% END %]
                        </tbody>
                    </table>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course Reserves &rsaquo; [% IF course_name %] Edit [% course_name %] [% ELSE %] New Course [% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

<script type="text/javascript">
//<![CDATA[

    function Check(f) {
        var _alertString = "";

        if( ! $("#department").val() ) {
            _alertString += _("- You must choose a department") + "\n";
        }

        if( ! $("#course_number").val() ) {
            _alertString += _("- You must choose a course number") + "\n";
        }

        if( ! $("#course_name").val() ) {
            _alertString += _("- You must add a course name") + "\n";
        }

        if ( _alertString.length ) {
            var alertHeader;
            alertHeader = _("Form not submitted because of the following problem(s)");
            alertHeader += "\n------------------------------------------------------------------------------------\n\n";

            alert( alertHeader + _alertString );
        } else {
            f.submit();
        }
    }

//]]>
</script>

<script type="text/javascript">
//<![CDATA[
YAHOO.util.Event.onContentReady("find_instructor", function() {
    new function() {
        // Define a custom formatter function
        this.fnCustomFormatter = function(oResultItem, sQuery) {
            var name        = oResultItem[0];
            var cardnumber  = oResultItem[1];
            var address     = oResultItem[2];
            var city        = oResultItem[3];
            var zip         = oResultItem[4];

            var aMarkup = [
                "<div class=\"sample-result\">",
                name,
                " (",
                cardnumber,
                ")<small> -- ",
                address,
                ", ",
                city,
                "<\/small>",
                "<\/div>"];
            return (aMarkup.join(""));
        };

        // Instantiate one XHR DataSource and define schema as an array:
        //     ["Record Delimiter",
        //     "Field Delimiter"]
        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
        this.oACDS.maxCacheEntries = 60;
        this.oACDS.queryMatchSubset = true;

        // Instantiate first AutoComplete
        var myInput = document.getElementById('find_instructor');
        var myContainer = document.getElementById('find_instructor_container');
        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
        this.oAutoComp.formatResult = this.fnCustomFormatter;

        var myHandler = function(sType, aArgs) {
	        var myAC = aArgs[0]; // reference back to the AC instance
	        var elLI = aArgs[1]; // reference to the selected LI element
	        var oData = aArgs[2]; // object literal of selected item's result data

                AddInstructor( oData[0], oData[1] );
	};

        this.oAutoComp.itemSelectEvent.subscribe( myHandler );
}
});

function AddInstructor( name, cardnumber ) {
    div = "<div id='borrower_" + cardnumber + "'>" + name + " ( <a href='#' onclick='RemoveInstructor(" + cardnumber + ");'> Remove </a> ) <input type='hidden' name='instructors' value='" + cardnumber + "' /></div>";
    $('#instructors').append( div );

    $('#find_instructor').val('').focus();
}

function RemoveInstructor( cardnumber ) {
    $( '#borrower_' + cardnumber ).remove();
}

//]]>
</script>

</head>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; [% IF course_name %] Edit <i>[% course_name %]</i> [% ELSE %] New Course [% END %]</div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">
                    <div class="yui-u first">
                        <form method="post" action="/cgi-bin/koha/course_reserves/mod_course.pl">
                            [% IF course_id %]<input type="hidden" name="course_id" value="[% course_id %]" />[% END %]
                            <fieldset class="rows">
                                <legend>[% IF course_id %] Edit [% ELSE %] Create [% END %] course</legend>
                                <ol>
                                    <li>
                                        <label class="required" for="department">Department:</label>
                                        <select id="department" name="department">
                                            <option value="">Select A Department</option>

                                            [% FOREACH d IN departments %]
                                                [% IF d.authorised_value == department %]
                                                    <option value="[% d.authorised_value %]" selected="selected">[% d.lib %]</option>
                                                [% ELSE %]
                                                    <option value="[% d.authorised_value %]">[% d.lib %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label class="required" for="course_number">Course number:</label>
                                        <input id="course_number" name="course_number" type="text" value="[% course_number %]" />
                                    </li>

                                    <li>
                                        <label for="section">Section:</label>
                                        <input id="section" name="section" type="text" value="[% section %]"/>
                                    </li>

                                    <li>
                                        <label class="required" for="course_name">Course name:</label>
                                        <input id="course_name" name="course_name" type="text" value="[% course_name %]" />
                                    </li>

                                    <li>
                                        <label for="term">Term:</label>
                                        <select id="term" name="term">
                                            <option value=""></option>

                                            [% FOREACH t IN terms %]
                                                [% IF t.authorised_value == term %]
                                                    <option value="[% t.authorised_value %]" selected="selected">[% t.lib %]</option>
                                                [% ELSE %]
                                                    <option value="[% t.authorised_value %]">[% t.lib %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <!-- TODO: Add Instructors -->
                                    <li>
                                        <label for="instructors">Instructors:</label>

                                        <fieldset>
                                             <div id="instructors">
                                                 [% FOREACH i IN instructors %]
                                                     <div id="borrower_[% i.cardnumber %]">
                                                         [% i.surname %], [% i.firstname %] ( <a href='#' onclick='RemoveInstructor( [% i.cardnumber %] );'> Remove </a> )
                                                         <input type='hidden' name='instructors' value='[% i.cardnumber %]' />
                                                     </div>
                                                 [% END %]
                                             </div>

                                        </fieldset>

                                        <fieldset>
                                            <label for="find_instructor">Instructor Search:</label>
                                            <input autocomplete="off" id="find_instructor" type="text" style="width:150px" class="noEnterSubmit"/>
                                            <div id="find_instructor_container"></div>
                                        </fieldset>
                                    <li>
                                        <label for="staff_note">Staff note:</label>
                                        <textarea name="staff_note" id="staff_note">[% staff_note %]</textarea>
                                    </li>

                                    <li>
                                        <label for="public_note">Public note:</label>
                                        <textarea name="public_note" id="public_note">[% public_note %]</textarea>
                                    </li>

                                    <li>
                                        <label for="students_count">Number of students:</label>
                                        <input id="students_count" name="students_count" type="text" value="[% students_count %]" />
                                    </li>

                                    <li>
                                        <label for="enabled">Enabled?</label>
                                        [% IF enabled == 'no' %]
                                            <input type="checkbox" name="enabled" id="enabled" />
                                        [% ELSE %]
                                            <input type="checkbox" name="enabled" id="enabled" checked="checked" />
                                        [% END %]
                                    </li>
                                </ol>
                            </fieldset>

                            <fieldset class="action">
                                <input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" />

                                <a href="/cgi-bin/koha/course_reserves/course-reserves.pl" class="cancel">Cancel</a>
                            </fieldset>

                    </div>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-1 / +1 lines)
4	<script type="text/javascript">	4	<script type="text/javascript">
5	//<![CDATA[	5	//<![CDATA[
6	$(document).ready(function(){	6	$(document).ready(function(){
7	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });	7	$("fieldset.rows input").addClass("noEnterSubmit");
8	});	8	});
9	//]]>	9	//]]>
10	</script>	10	</script>

Lines 4-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-1 / +1 lines)
4	<script type="text/javascript">	4	<script type="text/javascript">
5	//<![CDATA[	5	//<![CDATA[
6	$(document).ready(function(){	6	$(document).ready(function(){
7	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });	7	$("fieldset.rows input").addClass("noEnterSubmit");
8	});	8	});
9	//]]>	9	//]]>
10	</script>	10	</script>

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
6	<script type="text/JavaScript">	6	<script type="text/JavaScript">
7	//<![CDATA[	7	//<![CDATA[
8	$(document).ready(function() {	8	$(document).ready(function() {
9	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });	9	$("fieldset.rows input").addClass("noEnterSubmit");
10	$("#guarantordelete").click(function() {	10	$("#guarantordelete").click(function() {
11	$("#contact-details").hide().find('a').remove();	11	$("#contact-details").hide().find('a').remove();
12	$("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });	12	$("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });

Lines 110-115 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc (+1 lines)
110		110
111	<div id="moresearches">	111	<div id="moresearches">
112	<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>	112	<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
		113	[% IF ( UseCourseReserves ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
113	[% IF ( OpacBrowser ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]	114	[% IF ( OpacBrowser ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
114	[% IF ( OpacAuthorities ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]	115	[% IF ( OpacAuthorities ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]
115	[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]	116	[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]




[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE ItemTypes %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="opac-main">
[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
   <div id="bd">
[% INCLUDE 'masthead.inc' %]

<div id="doc2" class="yui-t7">
    <div id="yui-main">

        <table>
            <tr><th>Course Name</th><td>[% course.course_name %]</td></tr>
            <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
            <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
            <tr><th>Course Number</th><td>[% course.course_number %]</td></tr>
            <tr><th>Section</th><td>[% course.section %]</td></tr>
            <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor">[% i.firstname %] [% i.surname %]</div>[% END %]</td></tr>
            <tr><th>Notes</th><td>[% course.public_note %]</td></tr>
        </table>

        <table>
            <thead>
                <tr>
                    <th>Title</th>
                    <th>Item type</th>
                    <th>Location</th>
                    <th>Collection</th>
                    <th>Call number</th>
                    <th>Copy</th>
                    <th>Status</td>
                    <th>Date due</td>
                    <th>Notes</th>
                </tr>
            </thead>

            <tbody>
                [% FOREACH cr IN course_reserves %]
                    <tr>
                        <td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
                        <td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
                        <td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
                        <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
                        <td>[% cr.item.itemcallnumber %]</td>
                        <td>[% cr.item.copynumber %]</td>
                        <td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
                        <td>[% cr.issue.date_due | $KohaDates %]</td>
                        <td>[% cr.public_note %]</td>
                    </tr>
                [% END %]
            </tbody>
        </table>

    </div>
</div>


[% INCLUDE 'opac-bottom.inc' %]




[% USE AuthorisedValues %]

[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="opac-main">
[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
   <div id="bd">
[% INCLUDE 'masthead.inc' %]


<div id="doc2" class="yui-t7">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">

                    <div id="search-toolbar">
                        <form id="search_courses_form">
                            <input type="text" name="search_on" id="search_on" />
                            <input type="submit" value="Search" />
                        </form>
                    </div><!-- /toolbar -->

                    <h1>Courses</h1>
                    <table id="course_reserves_table">
                        <thead>
                            <tr>
                                <th>Name</th>
                                <th>Dept.</th>
                                <th>Course #</th>
                                <th>Section</th>
                                <th>Term</th>
                                <th>Instructors</th>
                                <th>Notes</th>
                            </tr>
                        </thead>

                        <tbody>
                            [% FOREACH c IN courses %]
                                <tr>
                                    <td><a href="opac-course-details.pl?course_id=[% c.course_id %]">[% c.course_name %]</a></td>
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) %]</td>
                                    <td>[% c.course_number %]</td>
                                    <td>[% c.section %]</td>
                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) %]</td>
                                    <td>
                                      [% FOREACH i IN c.instructors %]
                                          <div class="instructor">[% i.firstname %] [% i.surname %]</div>
                                      [% END %]
                                    </td>
                                    <td>[% c.public_note %]</td>
                            [% END %]
                        </tbody>
                    </table>
                </div>
            </div>
        </div>
</div>


[% INCLUDE 'opac-bottom.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (+28 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
		2	[% USE AuthorisedValues %]
		3
		4	[% ShowCourseReservesHeader = 0 %]
		5	[% IF UseCourseReserves %]
		6	[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
		7	[% IF ITEM_RESULT.course_reserves %]
		8	[% ShowCourseReservesHeader = 1 %]
		9	[% END %]
		10	[% END %]
		11	[% END %]
2		12
3	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title \|html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield \|html %][% END %]	13	[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title \|html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield \|html %][% END %]
4	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]
Lines 724-729 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
724	[% ELSIF show_priority %]	734	[% ELSIF show_priority %]
725	<th>Item hold queue priority</th>	735	<th>Item hold queue priority</th>
726	[% END %]	736	[% END %]
		737	[% IF ( ShowCourseReservesHeader ) %]<th id="item_coursereserves">Course Reserves</th>[% END %]
727	</tr></thead>	738	</tr></thead>
728	<tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]	739	<tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
729	<tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]	740	<tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
Lines 761-766 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
761	[% END %]	772	[% END %]
762	</td>	773	</td>
763	[% END %]	774	[% END %]
		775
		776	[% IF UseCourseReserves %]
		777	<td>
		778	[% IF ITEM_RESULT.course_reserves %]
		779	[% FOREACH r IN ITEM_RESULT.course_reserves %]
		780	<p>
		781	<a href="opac-course-details.pl?course_id=[% r.course.course_id %]">
		782	[% r.course.course_name %]
		783	<!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]-->
		784	[% IF r.course.section %] [% r.course.section %] [% END %]
		785	[% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %]
		786	</a>
		787	</p>
		788	[% END %]
		789	[% END %]
		790	</td>
		791	[% END %]
764	</tr>	792	</tr>
765	[% END %]</tbody>	793	[% END %]</tbody>
766	</table>	794	</table>




#!/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 Koha::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;




#!/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 Koha::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;
}

Lines 49-54 use MARC::Field; Link Here

(-)a/opac/opac-detail.pl (-1 / +6 lines)
49	use List::MoreUtils qw/any none/;	49	use List::MoreUtils qw/any none/;
50	use C4::Images;	50	use C4::Images;
51	use Koha::DateUtils;	51	use Koha::DateUtils;
		52	use Koha::CourseReserves;
52		53
53	BEGIN {	54	BEGIN {
54	if (C4::Context->preference('BakerTaylorEnabled')) {	55	if (C4::Context->preference('BakerTaylorEnabled')) {
Lines 1000-1003 if (C4::Context->preference('OPACLocalCoverImages') == 1) { Link Here
1000	$template->{VARS}->{localimages} = \@images;	1001	$template->{VARS}->{localimages} = \@images;
1001	}	1002	}
1002		1003
		1004	if ( C4::Context->preference('UseCourseReserves') ) {
		1005	foreach my $i ( @items ) {
		1006	$i->{'course_reserves'} = GetItemReservesInfo( itemnumber => $i->{'itemnumber'} );
		1007	}
		1008	}
1003	output_html_with_http_headers $query, $cookie, $template->output;	1009	output_html_with_http_headers $query, $cookie, $template->output;
1004	-

Return to bug 8215

Lines 465-470 CREATE TABLE collections_tracking ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (+63 lines)
465	) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;	465	) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;
466		466
467	--	467	--
		468	-- Table structure for table `courses`
		469	--
		470	DROP TABLE IF EXISTS courses;
		471	CREATE TABLE `courses` (
		472	`course_id` int(11) NOT NULL AUTO_INCREMENT,
		473	`department` varchar(20) DEFAULT NULL,
		474	`course_number` varchar(255) DEFAULT NULL,
		475	`section` varchar(255) DEFAULT NULL,
		476	`course_name` varchar(255) DEFAULT NULL,
		477	`term` varchar(20) DEFAULT NULL,
		478	`staff_note` mediumtext,
		479	`public_note` mediumtext,
		480	`students_count` varchar(20) DEFAULT NULL,
		481	`enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
		482	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		483	PRIMARY KEY (`course_id`)
		484	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		485
		486	--
		487	-- Table structure for table `course_instructors`
		488	--
		489	DROP TABLE IF EXISTS course_instructors;
		490	CREATE TABLE `course_instructors` (
		491	`course_id` int(11) NOT NULL,
		492	`borrowernumber` int(11) NOT NULL,
		493	PRIMARY KEY (`course_id`,`borrowernumber`),
		494	KEY `borrowernumber` (`borrowernumber`)
		495	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		496
		497	--
		498	-- Table structure for table `course_items`
		499	--
		500	DROP TABLE IF EXISTS course_items;
		501	CREATE TABLE `course_items` (
		502	`ci_id` int(11) NOT NULL AUTO_INCREMENT,
		503	`itemnumber` int(11) NOT NULL,
		504	`itype` varchar(10) DEFAULT NULL,
		505	`ccode` varchar(10) DEFAULT NULL,
		506	`holdingbranch` varchar(10) DEFAULT NULL,
		507	`location` varchar(80) DEFAULT NULL,
		508	`enabled` enum('yes','no') NOT NULL DEFAULT 'no',
		509	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		510	PRIMARY KEY (`ci_id`),
		511	UNIQUE KEY `itemnumber` (`itemnumber`)
		512	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		513
		514	--
		515	-- Table structure for table `course_reserves`
		516	--
		517	DROP TABLE IF EXISTS course_reserves;
		518	CREATE TABLE `course_reserves` (
		519	`cr_id` int(11) NOT NULL AUTO_INCREMENT,
		520	`course_id` int(11) NOT NULL,
		521	`ci_id` int(11) NOT NULL,
		522	`staff_note` mediumtext,
		523	`public_note` mediumtext,
		524	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		525	PRIMARY KEY (`cr_id`),
		526	UNIQUE KEY `psuedo_key` (`course_id`,`ci_id`),
		527	KEY `course_id` (`course_id`)
		528	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		529
		530	--
468	-- Table structure for table `borrower_branch_circ_rules`	531	-- Table structure for table `borrower_branch_circ_rules`
469	--	532	--
470		533

Lines 5635-5640 if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+71 lines)
5635	SetVersion($DBversion);	5635	SetVersion($DBversion);
5636	}	5636	}
5637		5637
		5638	$DBversion = "3.09.00.XXX";
		5639	if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
		5640	$dbh->do("INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('UseCourseReserves', '0', NULL, 'Enable the course reserves feature.', 'YesNo')");
		5641	$dbh->do("INSERT INTO userflags (bit,flag,flagdesc,defaulton) VALUES ('18','coursereserves','Course Reserves','0')");
		5642	$dbh->do("
		5643	CREATE TABLE `courses` (
		5644	`course_id` int(11) NOT NULL AUTO_INCREMENT,
		5645	`department` varchar(20) DEFAULT NULL,
		5646	`course_number` varchar(255) DEFAULT NULL,
		5647	`section` varchar(255) DEFAULT NULL,
		5648	`course_name` varchar(255) DEFAULT NULL,
		5649	`term` varchar(20) DEFAULT NULL,
		5650	`staff_note` mediumtext,
		5651	`public_note` mediumtext,
		5652	`students_count` varchar(20) DEFAULT NULL,
		5653	`enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
		5654	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		5655	PRIMARY KEY (`course_id`)
		5656	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		5657	");
		5658
		5659	$dbh->do("
		5660	CREATE TABLE `course_instructors` (
		5661	`course_id` int(11) NOT NULL,
		5662	`borrowernumber` int(11) NOT NULL,
		5663	PRIMARY KEY (`course_id`,`borrowernumber`),
		5664	KEY `borrowernumber` (`borrowernumber`)
		5665	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		5666	");
		5667
		5668	$dbh->do("
		5669	CREATE TABLE `course_items` (
		5670	`ci_id` int(11) NOT NULL AUTO_INCREMENT,
		5671	`itemnumber` int(11) NOT NULL,
		5672	`itype` varchar(10) DEFAULT NULL,
		5673	`ccode` varchar(10) DEFAULT NULL,
		5674	`holdingbranch` varchar(10) DEFAULT NULL,
		5675	`location` varchar(80) DEFAULT NULL,
		5676	`enabled` enum('yes','no') NOT NULL DEFAULT 'no',
		5677	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		5678	PRIMARY KEY (`ci_id`),
		5679	UNIQUE KEY `itemnumber` (`itemnumber`)
		5680	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		5681	");
		5682
		5683	$dbh->do("
		5684	CREATE TABLE `course_reserves` (
		5685	`cr_id` int(11) NOT NULL AUTO_INCREMENT,
		5686	`course_id` int(11) NOT NULL,
		5687	`ci_id` int(11) NOT NULL,
		5688	`staff_note` mediumtext,
		5689	`public_note` mediumtext,
		5690	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		5691	PRIMARY KEY (`cr_id`),
		5692	UNIQUE KEY `psuedo_key` (`course_id`,`ci_id`),
		5693	KEY `course_id` (`course_id`)
		5694	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		5695	");
		5696
		5697	$dbh->do("
		5698	INSERT INTO permissions (module_bit, code, description) VALUES
		5699	(18, 'manage_courses', 'Add, edit and delete courses'),
		5700	(18, 'add_reserves', 'Add course reserves'),
		5701	(18, 'delete_reserves', 'Remove course reserves')
5702	;
5703	");
5704
5705	print "Upgrade to $DBversion done (Add Course Reserves ( system preference UseCourseReserves ))\n";
5706	SetVersion($DBversion);
5707	}
5708
5638	=head1 FUNCTIONS	5709	=head1 FUNCTIONS
5639		5710
5640	=head2 TableExists($table)	5711	=head2 TableExists($table)

Lines 194-200 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-1 / +3 lines)
194	$template->param( CAN_user_reserveforothers => 1 );	194	$template->param( CAN_user_reserveforothers => 1 );
195	$template->param( CAN_user_borrow => 1 );	195	$template->param( CAN_user_borrow => 1 );
196	$template->param( CAN_user_editcatalogue => 1 );	196	$template->param( CAN_user_editcatalogue => 1 );
197	$template->param( CAN_user_updatecharges => 1 );	197	$template->param( CAN_user_updatecharges => 1 );
198	$template->param( CAN_user_acquisition => 1 );	198	$template->param( CAN_user_acquisition => 1 );
199	$template->param( CAN_user_management => 1 );	199	$template->param( CAN_user_management => 1 );
200	$template->param( CAN_user_tools => 1 );	200	$template->param( CAN_user_tools => 1 );
Lines 202-207 sub get_template_and_user { Link Here
202	$template->param( CAN_user_serials => 1 );	202	$template->param( CAN_user_serials => 1 );
203	$template->param( CAN_user_reports => 1 );	203	$template->param( CAN_user_reports => 1 );
204	$template->param( CAN_user_staffaccess => 1 );	204	$template->param( CAN_user_staffaccess => 1 );
		205	$template->param( CAN_user_coursereserves => 1 );
205	foreach my $module (keys %$all_perms) {	206	foreach my $module (keys %$all_perms) {
206	foreach my $subperm (keys %{ $all_perms->{$module} }) {	207	foreach my $subperm (keys %{ $all_perms->{$module} }) {
207	$template->param( "CAN_user_${module}_${subperm}" => 1 );	208	$template->param( "CAN_user_${module}_${subperm}" => 1 );
Lines 330-335 sub get_template_and_user { Link Here
330	using_https => $in->{'query'}->https() ? 1 : 0,	331	using_https => $in->{'query'}->https() ? 1 : 0,
331	noItemTypeImages => C4::Context->preference("noItemTypeImages"),	332	noItemTypeImages => C4::Context->preference("noItemTypeImages"),
332	marcflavour => C4::Context->preference("marcflavour"),	333	marcflavour => C4::Context->preference("marcflavour"),
		334	UseCourseReserves => C4::Context->preference("UseCourseReserves"),
333	);	335	);
334		336
335	if ( $in->{'type'} eq "intranet" ) {	337	if ( $in->{'type'} eq "intranet" ) {

Line 0 Link Here

(-)a/Koha/Template/Plugin/AuthorisedValues.pm (+32 lines)
	1	package Koha::Template::Plugin::AuthorisedValues;
	2
	3	# Copyright ByWater Solutions 2012
	4
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 2 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use Template::Plugin;
	23	use base qw( Template::Plugin );
	24
	25	use C4::Koha;
	26
	27	sub GetByCode {
	28	my ( $self, $category, $code, $opac ) = @_;
	29	return GetAuthorisedValueByCode( $category, $code, $opac );
	30	}
	31
	32	1;

Line 0 Link Here

(-)a/Koha/Template/Plugin/Branches.pm (+37 lines)
	1	package Koha::Template::Plugin::Branches;
	2
	3	# Copyright ByWater Solutions 2012
	4
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 2 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use Template::Plugin;
	23	use base qw( Template::Plugin );
	24
	25	use C4::Koha;
	26
	27	sub GetName {
	28	my ( $self, $branchcode ) = @_;
	29
	30	my $query = "SELECT branchname FROM branches WHERE branchcode = ?";
	31	my $sth = C4::Context->dbh->prepare($query);
	32	$sth->execute($branchcode);
	33	my $b = $sth->fetchrow_hashref();
	34	return $b->{'branchname'};
	35	}
	36
	37	1;

Line 0 Link Here

(-)a/Koha/Template/Plugin/ItemTypes.pm (+38 lines)
	1	package Koha::Template::Plugin::ItemTypes;
	2
	3	# Copyright ByWater Solutions 2012
	4
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 2 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use Template::Plugin;
	23	use base qw( Template::Plugin );
	24
	25	use C4::Koha;
	26
	27	sub GetDescription {
	28	my ( $self, $itemtype ) = @_;
	29
	30	my $query = "SELECT description FROM itemtypes WHERE itemtype = ?";
	31	my $sth = C4::Context->dbh->prepare($query);
	32	$sth->execute($itemtype);
	33	my $d = $sth->fetchrow_hashref();
	34	return $d->{'description'};
	35
	36	}
	37
	38	1;

Line 0 Link Here

(-)a/course_reserves/add_items.pl (+94 lines)
		1	#!/usr/bin/perl
		2
		3	#
		4	# Copyright 2012 Bywater Solutions
		5	#
		6	# This file is part of Koha.
		7	#
		8	# Koha is free software; you can redistribute it and/or modify it under the
		9	# terms of the GNU General Public License as published by the Free Software
		10	# Foundation; either version 2 of the License, or (at your option) any later
		11	# version.
		12	#
		13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License along
		18	# with Koha; if not, write to the Free Software Foundation, Inc.,
		19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		20
		21	use Modern::Perl;
		22
		23	use CGI;
		24
		25	use C4::Auth;
		26	use C4::Output;
		27	use C4::Koha;
		28	use C4::Biblio;
		29	use C4::Branch;
		30
		31	use Koha::CourseReserves;
		32
		33	my $cgi = new CGI;
		34
		35	my $action = $cgi->param('action') \|\| '';
		36	my $course_id = $cgi->param('course_id') \|\| '';
		37	my $barcode = $cgi->param('barcode') \|\| '';
		38
		39	die('No course_id provided') unless ($course_id);
		40
		41	my $item = GetBiblioFromItemNumber( undef, $barcode );
		42
		43	my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';
		44
		45	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		46	{
		47	template_name => "course_reserves/add_items-step$step.tmpl",
		48	query => $cgi,
		49	type => "intranet",
		50	authnotrequired => 0,
		51	flagsrequired => { coursereserves => 'add_reserves' },
		52	}
		53	);
		54	$template->param( ERROR_BARCODE_NOT_FOUND => $barcode ) unless ( $barcode && $item && $action eq 'lookup' );
		55
		56	$template->param( course => GetCourse($course_id) );
		57
		58	if ( $action eq 'lookup' ) {
		59	my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} );
		60	my $course_reserve = GetCourseReserve(
		61	course_id => $course_id,
		62	ci_id => $course_item->{'ci_id'}
		63	) if ($course_item);
		64
65	$template->param(
66	item => $item,
67	course_item => $course_item,
68	course_reserve => $course_reserve,
69
70	ccodes => GetAuthorisedValues('CCODE'),
71	locations => GetAuthorisedValues('LOC'),
72	itypes => GetItemTypesFlat(),
73	branches => GetBranchesLoop(),
74	);
75
76	}
77	elsif ( $action eq 'add' ) {
78	my $ci_id = ModCourseItem(
79	itemnumber => $cgi->param('itemnumber'),
80	itype => $cgi->param('itype'),
81	ccode => $cgi->param('ccode'),
82	holdingbranch => $cgi->param('holdingbranch'),
83	location => $cgi->param('location'),
84	);
85
86	my $cr_id = ModCourseReserve(
87	course_id => $course_id,
88	ci_id => $ci_id,
89	staff_note => $cgi->param('staff_note'),
90	public_note => $cgi->param('public_note'),
91	);
92	}
93
94	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/course_reserves/course-details.pl (+64 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27	use C4::Koha;
	28
	29	use Koha::CourseReserves;
	30
	31	my $cgi = new CGI;
	32
	33	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	34	{
	35	template_name => "course_reserves/course-details.tmpl",
	36	query => $cgi,
	37	type => "intranet",
	38	authnotrequired => 0,
	39	flagsrequired => { coursereserves => 'manage_courses' },
	40	}
	41	);
	42
	43	my $action = $cgi->param('action') \|\| '';
	44	my $course_id = $cgi->param('course_id');
	45
	46	die("No course_id given") unless ($course_id);
	47
	48	if ( $action eq 'del_reserve' ) {
	49	DelCourseReserve( cr_id => $cgi->param('cr_id') );
	50	}
	51
	52	my $course = GetCourse($course_id);
	53	my $course_reserves = GetCourseReserves(
	54	course_id => $course_id,
	55	include_items => 1,
	56	include_courses => 1
	57	);
	58
	59	$template->param(
	60	course => $course,
	61	course_reserves => $course_reserves,
	62	);
	63
	64	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/course_reserves/course-reserves.pl (+54 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27
	28	use Koha::CourseReserves;
	29
	30	my $cgi = new CGI;
	31
	32	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	33	{
	34	template_name => "course_reserves/course-reserves.tmpl",
	35	query => $cgi,
	36	type => "intranet",
	37	authnotrequired => 0,
	38	flagsrequired => { coursereserves => 'manage_courses' },
	39	}
	40	);
	41
	42	my $search_on = $cgi->param('search_on');
	43	my %params;
	44	if ($search_on) {
	45	$params{'course_name'} = "%$search_on%";
	46	}
	47
	48	my $courses = GetCourses(%params);
	49	if ( $search_on && @$courses == 1 ) {
	50	print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=" . $courses->[0]->{'course_id'});
	51	} else {
	52	$template->param( courses => $courses );
	53	output_html_with_http_headers $cgi, $cookie, $template->output;
	54	}

Line 0 Link Here

(-)a/course_reserves/course.pl (+57 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27	use C4::Koha;
	28
	29	use Koha::CourseReserves;
	30
	31	my $cgi = new CGI;
	32
	33	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	34	{
	35	template_name => "course_reserves/course.tmpl",
	36	query => $cgi,
	37	type => "intranet",
	38	authnotrequired => 0,
	39	flagsrequired => { coursereserves => 1 },
	40	}
	41	);
	42
	43	my $course_id = $cgi->param('course_id');
	44
	45	if ($course_id) {
	46	my $course = GetCourse($course_id);
	47	$template->param(%$course);
	48	}
	49
	50	$template->param(
	51	departments => GetAuthorisedValues('DEPARTMENT')
	52	, ## TODO: use syspref instead of hard coded value.
	53	terms => GetAuthorisedValues('TERM')
	54	, ## TODO: use syspref instead of hard coded value.
	55	);
	56
	57	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/course_reserves/mod_course.pl (+76 lines)
		1	#!/usr/bin/perl
		2
		3	#script to modify reserves/requests
		4	#written 2/1/00 by chris@katipo.oc.nz
		5	#last update 27/1/2000 by chris@katipo.co.nz
		6
		7	# Copyright 2000-2002 Katipo Communications
		8	#
		9	# This file is part of Koha.
		10	#
		11	# Koha is free software; you can redistribute it and/or modify it under the
		12	# terms of the GNU General Public License as published by the Free Software
		13	# Foundation; either version 2 of the License, or (at your option) any later
		14	# version.
		15	#
		16	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		17	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		18	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		19	#
		20	# You should have received a copy of the GNU General Public License along
		21	# with Koha; if not, write to the Free Software Foundation, Inc.,
		22	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		23
		24	use Modern::Perl;
		25
		26	use CGI;
		27
		28	use C4::Output;
		29	use C4::Reserves;
		30	use C4::Auth;
		31
		32	use Koha::CourseReserves;
		33
		34	my $cgi = new CGI;
		35	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		36	{
		37	template_name => "about.tmpl",
		38	query => $cgi,
		39	type => "intranet",
		40	authnotrequired => 0,
		41	flagsrequired => { coursereserves => 1 },
		42	}
		43	);
		44
		45	my $action = $cgi->param('action');
		46
		47	if ( $action eq 'del' ) {
		48	DelCourse( $cgi->param('course_id') );
		49	print $cgi->redirect("/cgi-bin/koha/course_reserves/course-reserves.pl");
		50	}
		51	else {
		52	my %params;
		53
		54	$params{'course_id'} = $cgi->param('course_id')
		55	if ( $cgi->param('course_id') );
		56	$params{'department'} = $cgi->param('department');
		57	$params{'course_number'} = $cgi->param('course_number');
		58	$params{'section'} = $cgi->param('section');
		59	$params{'course_name'} = $cgi->param('course_name');
		60	$params{'term'} = $cgi->param('term');
		61	$params{'staff_note'} = $cgi->param('staff_note');
		62	$params{'public_note'} = $cgi->param('public_note');
		63	$params{'students_count'} = $cgi->param('students_count');
		64	$params{'enabled'} = ( $cgi->param('enabled') eq 'on' ) ? 'yes' : 'no';
65
66	my $course_id = ModCourse(%params);
67
68	my @instructors = $cgi->param('instructors');
69	ModCourseInstructors(
70	mode => 'replace',
71	cardnumbers => \@instructors,
72	course_id => $course_id
73	);
74	print $cgi->redirect(
75	"/cgi-bin/koha/course_reserves/course-details.pl?course_id=$course_id");
76	}

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+32 lines)
		1	[% USE AuthorisedValues %]
		2
		3	[% ShowCourseReserves = 0 %]
		4	[% IF UseCourseReserves %]
		5	[% FOREACH item IN itemloop %]
		6	[% IF item.course_reserves %]
		7	[% IF item.course_reserves.course.enabled == 'yes' %]
		8	[% ShowCourseReserves = 1 %]
		9	[% END %]
		10	[% END %]
		11	[% END %]
		12	[% END %]
		13
1	[% INCLUDE 'doc-head-open.inc' %]	14	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Catalog &rsaquo;	15	<title>Koha &rsaquo; Catalog &rsaquo;
3	[% IF ( unknownbiblionumber ) %]	16	[% IF ( unknownbiblionumber ) %]
Lines 285-290 function verify_images() { Link Here
285	[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]	298	[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]
286	[% IF ( hostrecords ) %]<th>Host records</th>[% END %]	299	[% IF ( hostrecords ) %]<th>Host records</th>[% END %]
287	[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]	300	[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]
		301	[% IF ( ShowCourseReserves ) %]<th>Course Reserves</th>[% END %]
288	</tr>	302	</tr>
289	[% FOREACH itemloo IN itemloop %]	303	[% FOREACH itemloo IN itemloop %]
290	<tr>	304	<tr>
Lines 421-426 function verify_images() { Link Here
421	<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% itemloo.biblionumber %]&hostitemnumber=[% itemloo.itemnumber %]">Create analytics</a></td>	435	<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% itemloo.biblionumber %]&hostitemnumber=[% itemloo.itemnumber %]">Create analytics</a></td>
422	[% END %]	436	[% END %]
423		437
		438	[% IF ShowCourseReserves %]
		439	<td>
		440	[% IF itemloo.course_reserves %]
		441	[% FOREACH r IN itemloo.course_reserves %]
		442	[% IF r.course.enabled == 'yes' %]
		443	<p>
		444	<a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id %]">
		445	[% r.course.course_name %]
		446	<!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]-->
		447	[% IF r.course.section %] [% r.course.section %] [% END %]
		448	[% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %]
		449	</a>
		450	</p>
		451	[% END %]
		452	[% END %]
		453	[% END %]
		454	</td>
		455	[% END %]
424	</tr>	456	</tr>
425	[% END %]	457	[% END %]
426	</table>	458	</table>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt (+63 lines)
	1	[% INCLUDE 'doc-head-open.inc' %]
	2	<title>Koha &rsaquo; Course Reserves &rsaquo; Add Items</title>
	3	[% INCLUDE 'doc-head-close.inc' %]
	4	</head>
	5
	6	<script type="text/javascript">
	7	//<![CDATA[
	8
	9	$(document).ready(function() {
	10	$('#barcode').focus();
	11	});
	12
	13	//]]>
	14	</script>
	15
	16	<body>
	17
	18	[% INCLUDE 'header.inc' %]
	19	[% INCLUDE 'cat-search.inc' %]
	20
	21	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Add Reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
	22
	23	<div id="doc2" class="yui-t7">
	24	<div id="bd">
	25	<div id="yui-main">
	26	<div class="yui-b">
	27	<div class="yui-g">
	28	<div class="yui-u first">
	29	[% IF ERROR_BARCODE_NOT_FOUND %]
	30	<div class="error">No item found for barcode [% ERROR_BARCODE_NOT_FOUND %]</div>
	31	[% END %]
	32
	33	<form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
	34	<input type="hidden" name="course_id" value="[% course.course_id %]" />
	35	<input type="hidden" name="action" value="lookup" />
	36
	37	<fieldset class="rows">
	38	<legend>Add Items: Scan Barcode</legend>
	39
	40	<p>
	41
	42	<li>
	43	<label class="required" for="barcode">Item Barcode:</label>
	44	<input id="barcode" name="barcode" type="text" />
	45	</li>
	46	</ol>
	47	</fieldset>
	48
	49	<fieldset class="action">
	50	<input type="submit" value="Submit" class="submit" />
	51
	52	<a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
	53	</fieldset>
	54	</form>
	55	</div>
	56	</div>
	57	</div>
	58	</div>
	59	</div>
	60	</div>
	61
	62
	63	[% INCLUDE 'intranet-bottom.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt (+179 lines)
		1	[% USE AuthorisedValues %]
		2	[% USE ItemTypes %]
		3	[% USE Branches %]
		4	[% INCLUDE 'doc-head-open.inc' %]
		5	<title>Koha &rsaquo; Course Reserves &rsaquo; New Course</title>
		6	[% INCLUDE 'doc-head-close.inc' %]
		7
		8	<script type="text/javascript">
		9	//<![CDATA[
		10
		11	function confirmItemDelete(){
		12	return confirm( _('Are you sure you want to delete this item?');
		13	}
		14
		15	//]]>
		16	</script>
		17
		18	</head>
		19
		20	<body>
		21
		22	[% INCLUDE 'header.inc' %]
		23	[% INCLUDE 'cat-search.inc' %]
		24
		25	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Course Details for <i>[% course.course_name %]</i></div>
		26
		27	<div id="doc2" class="yui-t7">
		28	<div id="bd">
		29	<div id="yui-main">
		30	<div id="toolbar">
		31	<script type="text/javascript">
		32	//<![CDATA[
		33	$(document).ready(function(){
		34	addItemsButton = new YAHOO.widget.Button("add_items");
		35	editCourseButton = new YAHOO.widget.Button("edit_course");
		36	deleteCourseButton = new YAHOO.widget.Button("delete_course");
		37
		38	deleteCourseButton.on("click", confirmDelete );
		39	});
		40
		41	function confirmDelete(p_oEvent){
		42	if ( ! confirm( _('Are you sure you want to delete this course?') ) ) {
		43	YAHOO.util.Event.stopEvent( p_oEvent );
		44	}
		45	}
		46
		47	//]]>
		48	</script>
		49	<ul class="toolbar">
		50	[% IF CAN_user_coursereserves_add_reserves %]<li><a id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]">Add Reserves</a></li>[% END %]
		51	<li><a id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]">Edit Course</a></li>
		52	<li><a id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del">Delete Course</a></li>
		53	</ul>
		54	</div><!-- /toolbar -->
		55
		56	<table>
		57	<tr><th>Course name</th><td>[% course.course_name %]</td></tr>
		58	<tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
		59	<tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
		60	<tr><th>Course number</th><td>[% course.course_number %]</td></tr>
		61	<tr><th>Section</th><td>[% course.section %]</td></tr>
		62	<tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>[% END %]</td></tr>
		63	<tr><th>Staff note</th><td>[% course.staff_note %]</td></tr>
		64	<tr><th>Public note</th><td>[% course.public_note %]</td></tr>
65	<tr><th>Students count</th><td>[% course.students_count %]</td></tr>
66	<tr><th>Status</th><td>[% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</td></tr>
67	</table>
68
69	<table>
70	<thead>
71	<tr>
72	<th>Title</th>
73	<th>Barcode</th>
74	<th>Call number</th>
75	<th>Item type</th>
76	<th>Collection</th>
77	<th>Location</th>
78	<th>Library</th>
79	<th>Staff note</th>
80	<th>Public note</th>
81	[% IF CAN_user_coursereserves_add_reserves %]<th> <!-- Edit --></th>[% END %]
82	[% IF CAN_user_coursereserves_delete_reserves %]<th> <!-- Remove --></th>[% END %]
83	<th>Other course reserves</th>
84	</tr>
85	</thead>
86
87	<tbody>
88	[% FOREACH cr IN course_reserves %]
89	<tr>
90	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
91	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber %]&biblionumber=[% cr.item.biblionumber %]&bi=[% cr.item.biblioitemnumber %]">[% cr.item.barcode %]</a></td>
92	<td>[% cr.item.itemcallnumber %]</td>
93	<td>
94	[% IF cr.course_item.itype %]
95	[% IF cr.course_item.enabled == 'yes' %]
96	[% ItemTypes.GetDescription( cr.item.itype ) %]
97	[% ELSE %]
98	[% ItemTypes.GetDescription( cr.course_item.itype ) %]
99	[% END %]
100	[% ELSE %]
101	<i>Unchanged</i>
102	[% END %]
103	</td>
104	<td>
105	[% IF cr.course_item.ccode %]
106	[% IF cr.course_item.enabled == 'yes' %]
107	[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]
108	[% ELSE %]
109	[% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) %]
110	[% END %]
111	[% ELSE %]
112	<i>Unchanged</i>
113	[% END %]
114	</td>
115	<td>
116	[% IF cr.course_item.location %]
117	[% IF cr.course_item.enabled == 'yes' %]
118	[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]
119	[% ELSE %]
120	[% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) %]
121	[% END %]
122	[% ELSE %]
123	<i>Unchanged</i>
124	[% END %]
125	</td>
126	<td>
127	[% IF cr.course_item.holdingbranch %]
128	[% IF cr.course_item.enabled == 'yes' %]
129	[% Branches.GetName( cr.item.holdingbranch ) %]
130	[% ELSE %]
131	[% Branches.GetName( cr.course_item.holdingbranch ) %]
132	[% END %]
133	[% ELSE %]
134	<i>Unchanged</i>
135	[% END %]
136	</td>
137	<td>[% cr.staff_note %]</td>
138	<td>[% cr.public_note %]</td>
139
140	[% IF CAN_user_coursereserves_add_reserves %]
141	<td><a href="add_items.pl?course_id=[% course.course_id %]&barcode=[% cr.item.barcode %]&action=lookup">Edit</a></td>
142	[% END %]
143
144	[% IF CAN_user_coursereserves_delete_reserves %]
145	<td>
146	[% IF cr.item.onloan %]
147	On Loan
148	[% ELSIF cr.item.itemlost %]
149	Item Lost
150	[% ELSE %]
151	<a href="course-details.pl?course_id=[% course.course_id %]&action=del_reserve&cr_id=[% cr.cr_id %]" onclick="return confirmItemDelete()" >Remove</a>
152	[% END %]
153
154	</td>
155	[% END %]
156
157	<td>
158	[% FOREACH course IN cr.courses %]
159	[% UNLESS cr.course_id == course.course_id %]
160	<p>
161	<a href="course-details.pl?course_id=[% course.course_id %]">
162	[% course.course_name %]
163	[% IF course.section %] [% course.section %] [% END %]
164	[% IF course.term %] [% AuthorisedValues.GetByCode( 'TERM', course.term ) %] [% END %]
165	</a>
166	</p>
167	[% END %]
168	[% END %]
169	</td>
170	</tr>
171	[% END %]
172	</tbody>
173	</table>
174	</div>
175	</div>
176	</div>
177
178
179	[% INCLUDE 'intranet-bottom.inc' %]

Line 0 Link Here

(-)a/opac/opac-course-details.pl (+60 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27	use C4::Koha;
	28
	29	use Koha::CourseReserves;
	30
	31	my $cgi = new CGI;
	32
	33	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
	34	{
	35	template_name => "opac-course-details.tmpl",
	36	query => $cgi,
	37	type => "opac",
	38	authnotrequired => 1,
	39	debug => 1,
	40	}
	41	);
	42
	43	my $action = $cgi->param('action') \|\| '';
	44	my $course_id = $cgi->param('course_id');
	45
	46	die( "No course_id given" ) unless ( $course_id );
	47
	48	if ( $action eq 'del_reserve' ) {
	49	DelCourseReserve( cr_id => $cgi->param('cr_id') );
	50	}
	51
	52	my $course = GetCourse( $course_id );
	53	my $course_reserves = GetCourseReserves( course_id => $course_id, include_items => 1, include_count => 1 );
	54
	55	$template->param(
	56	course => $course,
	57	course_reserves => $course_reserves,
	58	);
	59
	60	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/opac/opac-course-reserves.pl (+51 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27
	28	use Koha::CourseReserves;
	29
	30	my $cgi = new CGI;
	31
	32	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
	33	{
	34	template_name => "opac-course-reserves.tmpl",
	35	query => $cgi,
	36	type => "opac",
	37	authnotrequired => 1,
	38	debug => 1,
	39	}
	40	);
	41
	42	my $search_on = $cgi->param('search_on');
	43
	44	my $courses = SearchCourses( term => $search_on, enabled => 'yes' );
	45
	46	if ( @$courses == 1 ) {
	47	print $cgi->redirect("/cgi-bin/koha/opac-course-details.pl?course_id=" . $courses->[0]->{'course_id'});
	48	} else {
	49	$template->param( courses => $courses );
	50	output_html_with_http_headers $cgi, $cookie, $template->output;
	51	}